diff -Nru bitcoinabc-0.19.11-uahf/arcanist/linter/CheckRpcMappingsLinter.php bitcoinabc-0.19.12-uahf/arcanist/linter/CheckRpcMappingsLinter.php
--- bitcoinabc-0.19.11-uahf/arcanist/linter/CheckRpcMappingsLinter.php	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/linter/CheckRpcMappingsLinter.php	2019-08-16 12:22:07.000000000 +0000
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Uses the check-rpc-mappings.py script to ensure the RPC arguments types and
+ * names are consistent.
+ */
+final class CheckRpcMappingsLinter extends GlobalExternalLinter {
+
+  public function getInfoName() {
+    return 'check-rpc-mappings';
+  }
+
+  public function getInfoDescription() {
+    return pht('Check that the RPC arguments are consistent.');
+  }
+
+  public function getLinterName() {
+    return 'RPC_MAPPINGS';
+  }
+
+  public function getLinterConfigurationName() {
+    return 'check-rpc-mappings';
+  }
+
+  public function getDefaultBinary() {
+    return Filesystem::resolvePath('test/lint/check-rpc-mappings.py',
+      $this->getProjectRoot());
+  }
+
+  public function shouldUseInterpreter() {
+    return true;
+  }
+
+  public function getDefaultInterpreter() {
+    return "python3";
+  }
+
+  public function getInstallInstructions() {
+    return pht('The test/lint/check-rpc-mappings.py script is part of the '.
+               'bitcoin-abc project');
+  }
+
+  public function shouldExpectCommandErrors() {
+    return false;
+  }
+
+  protected function getMandatoryFlags() {
+    return array($this->getProjectRoot());
+  }
+
+  protected function parseGlobalLinterOutput($err, $stdout, $stderr) {
+    $messages = array();
+
+    // Find errors
+    if (preg_match_all('/ERROR:\s*(.*)/', $stdout, $errors, PREG_SET_ORDER)) {
+      foreach ($errors as $error) {
+        $messages[] = id(new ArcanistLintMessage())
+          ->setGranularity(ArcanistLinter::GRANULARITY_GLOBAL)
+          ->setCode('RPC_MAPPING_ERROR')
+          ->setSeverity(ArcanistLintSeverity::SEVERITY_ERROR)
+          ->setName('RPC mapping error')
+          ->setDescription($error[1]);
+      }
+    }
+
+    // Find warnings
+    if (preg_match_all('/WARNING:\s*(.*)/', $stdout, $warnings,
+      PREG_SET_ORDER)) {
+      foreach ($warnings as $warning) {
+        $messages[] = id(new ArcanistLintMessage())
+        ->setGranularity(ArcanistLinter::GRANULARITY_GLOBAL)
+        ->setCode('RPC_MAPPING_WARNING')
+        ->setSeverity(ArcanistLintSeverity::SEVERITY_WARNING)
+        ->setBypassChangedLineFiltering(true)
+        ->setName('RPC mapping warning')
+        ->setDescription($warning[1]);
+      }
+    }
+
+    return $messages;
+  }
+}
diff -Nru bitcoinabc-0.19.11-uahf/arcanist/linter/ClangFormatLinter.php bitcoinabc-0.19.12-uahf/arcanist/linter/ClangFormatLinter.php
--- bitcoinabc-0.19.11-uahf/arcanist/linter/ClangFormatLinter.php	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/linter/ClangFormatLinter.php	2019-08-16 12:22:07.000000000 +0000
@@ -40,10 +40,25 @@
     $matches = array();
     $regex = '/^clang-format version (?P<version>\d+\.\d+)\./';
     if (preg_match($regex, $stdout, $matches)) {
-      return $matches['version'];
+      $version = $matches['version'];
     } else {
       return false;
     }
+
+    /*
+     * FIXME: This is a hack to only allow for clang-format version 7.x.
+     * The .arclint `version` field only allow to filter versions using `=`,
+     * `>`, `<`, `>=` or `<=`. There is no facility to define that the required
+     * version should be >= 7.0 and < 8.0.
+     */
+    if ($version[0] != '7') {
+      throw new Exception(pht('Linter %s requires clang-format version 7.x. '.
+                              'You have version %s.',
+                              ClangFormatLinter::class,
+                              $version));
+    }
+
+    return $version;
   }
 
   public function getInstallInstructions() {
diff -Nru bitcoinabc-0.19.11-uahf/arcanist/linter/PythonOpenFileEncodingLinter.php bitcoinabc-0.19.12-uahf/arcanist/linter/PythonOpenFileEncodingLinter.php
--- bitcoinabc-0.19.11-uahf/arcanist/linter/PythonOpenFileEncodingLinter.php	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/linter/PythonOpenFileEncodingLinter.php	2019-08-16 12:22:07.000000000 +0000
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Make sure we explicitly set the encoding when opening text files with
+ * Python.
+ */
+final class PythonOpenFileEncodingLinter extends ArcanistLinter {
+
+  const ENCODING_NOT_FOUND = 1;
+
+  public function getInfoName() {
+    return 'lint-python-encoding';
+  }
+
+  public function getInfoDescription() {
+    return pht('Make sure we explicitly set the encoding when opening text '.
+               'files with Python');
+  }
+
+  public function getLinterName() {
+    return 'PYTHON_ENCODING';
+  }
+
+  public function getLinterConfigurationName() {
+    return 'lint-python-encoding';
+  }
+
+  public function getLintSeverityMap() {
+    return array(
+      self::ENCODING_NOT_FOUND => ArcanistLintSeverity::SEVERITY_ERROR,
+    );
+  }
+
+  public function getLintNameMap() {
+    return array(
+      self::ENCODING_NOT_FOUND => pht('Encoding should be specified when '.
+                                      'opening a text file.'),
+    );
+  }
+
+  public function lintPath($path) {
+    $path = Filesystem::resolvePath($path, $this->getProjectRoot());
+    $fileContent = Filesystem::readFile($path);
+
+    $pattern = "/[(\s]open(\(((?>[^()]+)|(?1))*\))/";
+    if (!preg_match_all($pattern, $fileContent, $matches,
+      PREG_OFFSET_CAPTURE)) {
+      return;
+    }
+
+    foreach ($matches[0] as $match) {
+      list($open, $offset) = $match;
+
+      $isBin = preg_match("/open\([^,]*, ['\"][^'\"]*b[^'\"]*['\"]/", $open);
+      $hasEncoding = preg_match("/encoding=.(ascii|utf8|utf-8)./", $open);
+
+      if (!$isBin && !$hasEncoding) {
+        $this->raiseLintAtOffset(
+          $offset + 1,
+          self::ENCODING_NOT_FOUND,
+          pht("Python's open(...) seems to be used to open text files without ".
+              "explicitly specifying encoding, or with an invalid encoding. ".
+              "Encoding should be 'ascii', 'utf-8' or 'utf8' (e.g.: ".
+              "`open(f, 'r', encoding='utf-8')`)."),
+          substr($open, 1),
+          null);
+      }
+    }
+  }
+}
diff -Nru bitcoinabc-0.19.11-uahf/arcanist/phpcs.xml bitcoinabc-0.19.12-uahf/arcanist/phpcs.xml
--- bitcoinabc-0.19.11-uahf/arcanist/phpcs.xml	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/phpcs.xml	2019-08-16 12:22:07.000000000 +0000
@@ -17,6 +17,8 @@
         <exclude name="Generic.Commenting.DocComment.ParamNotFirst" />
         <exclude name="Generic.Commenting.DocComment.SpacingBeforeTags" />
         <exclude name="Generic.Commenting.DocComment.TagValueIndent" />
+        <exclude name="Generic.Commenting.Fixme.TaskFound" />
+        <exclude name="Generic.Commenting.Todo.TaskFound" />
         <exclude name="Generic.Files.EndFileNoNewline.Found" />
         <exclude name="Generic.Files.LowercasedFilename" />
         <exclude name="Generic.Formatting.MultipleStatementAlignment" />
diff -Nru bitcoinabc-0.19.11-uahf/arcanist/__phutil_library_map__.php bitcoinabc-0.19.12-uahf/arcanist/__phutil_library_map__.php
--- bitcoinabc-0.19.11-uahf/arcanist/__phutil_library_map__.php	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/__phutil_library_map__.php	2019-08-16 12:22:07.000000000 +0000
@@ -14,6 +14,7 @@
     'BoostDependenciesLinter' => 'linter/BoostDependenciesLinter.php',
     'CHeaderLinter' => 'linter/CHeaderLinter.php',
     'CheckDocLinter' => 'linter/CheckDocLinter.php',
+    'CheckRpcMappingsLinter' => 'linter/CheckRpcMappingsLinter.php',
     'ClangFormatLinter' => 'linter/ClangFormatLinter.php',
     'ExtendedConfigurationDrivenLintEngine' => 'engine/ExtendedConfigurationDrivenLintEngine.php',
     'FileNameLinter' => 'linter/FileNameLinter.php',
@@ -25,6 +26,7 @@
     'IncludeSourceLinter' => 'linter/IncludeSourceLinter.php',
     'LocaleDependenceLinter' => 'linter/LocaleDependenceLinter.php',
     'PythonFormatLinter' => 'linter/PythonFormatLinter.php',
+    'PythonOpenFileEncodingLinter' => 'linter/PythonOpenFileEncodingLinter.php',
     'StdintLinter' => 'linter/StdintLinter.php',
     'TestsLinter' => 'linter/TestsLinter.php',
   ),
@@ -35,6 +37,7 @@
     'BoostDependenciesLinter' => 'GlobalExternalLinter',
     'CHeaderLinter' => 'ArcanistLinter',
     'CheckDocLinter' => 'GlobalExternalLinter',
+    'CheckRpcMappingsLinter' => 'GlobalExternalLinter',
     'ClangFormatLinter' => 'ArcanistExternalLinter',
     'ExtendedConfigurationDrivenLintEngine' => 'ArcanistLintEngine',
     'FileNameLinter' => 'ArcanistLinter',
@@ -48,6 +51,7 @@
     'IncludeSourceLinter' => 'ArcanistLinter',
     'LocaleDependenceLinter' => 'ArcanistLinter',
     'PythonFormatLinter' => 'ArcanistExternalLinter',
+    'PythonOpenFileEncodingLinter' => 'ArcanistLinter',
     'StdintLinter' => 'ArcanistLinter',
     'TestsLinter' => 'ArcanistExternalLinter',
   ),
diff -Nru bitcoinabc-0.19.11-uahf/arcanist/.phutil_module_cache bitcoinabc-0.19.12-uahf/arcanist/.phutil_module_cache
--- bitcoinabc-0.19.11-uahf/arcanist/.phutil_module_cache	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/arcanist/.phutil_module_cache	2019-08-16 12:22:07.000000000 +0000
@@ -1 +1 @@
-{"__symbol_cache_version__":11,"ae5b7d3d6b8cf9598ce4abaf0cd56b21":{"have":{"class":{"ExtendedConfigurationDrivenLintEngine":19}},"need":{"function":{"newv":159,"pht":933},"class":{"ArcanistLintEngine":65,"ArcanistConfigurationDrivenLintEngine":171,"PhutilConsole":866},"class\/interface":{"ILintOnce":634}},"xmap":{"ExtendedConfigurationDrivenLintEngine":["ArcanistLintEngine"]}},"2809b09d2021203b43c57da33d1fe8bf":{"have":{"class":{"AssertWithSideEffectsLinter":210}},"need":{"function":{"pht":439},"class":{"ArcanistLinter":246,"ArcanistLintSeverity":926,"Filesystem":1170}},"xmap":{"AssertWithSideEffectsLinter":["ArcanistLinter"]}},"90a8b110dc475955f15bb81d37268cb5":{"have":{"class":{"AutoPEP8FormatLinter":75}},"need":{"function":{"pht":297,"execx":769,"id":1903},"class":{"ArcanistExternalLinter":104,"ArcanistLintMessage":1910,"Filesystem":1754,"ArcanistLinter":2017,"ArcanistLintSeverity":2095}},"xmap":{"AutoPEP8FormatLinter":["ArcanistExternalLinter"]}},"38f0c676bff5192a344464142caaa253":{"have":{"class":{"CHeaderLinter":99}},"need":{"function":{"pht":611},"class":{"ArcanistLinter":121,"ArcanistLintSeverity":1060,"Filesystem":1307}},"xmap":{"CHeaderLinter":["ArcanistLinter"]}},"9bb48ec0fe2e9ced8e27d42540d0571c":{"have":{"class":{"CheckDocLinter":106}},"need":{"function":{"pht":321,"id":1845},"class":{"GlobalExternalLinter":129,"ArcanistLintMessage":1852,"Filesystem":729,"ArcanistLinter":1900,"ArcanistLintSeverity":1986}},"xmap":{"CheckDocLinter":["GlobalExternalLinter"]}},"6af7410cfea496ff1d4dcc2624b6b8ea":{"have":{"class":{"ClangFormatLinter":79}},"need":{"function":{"pht":302,"execx":781,"id":1653},"class":{"ArcanistExternalLinter":105,"ArcanistLintMessage":1660,"Filesystem":1504,"ArcanistLinter":1767,"ArcanistLintSeverity":1845}},"xmap":{"ClangFormatLinter":["ArcanistExternalLinter"]}},"75579a609dd975aa0226add52700c622":{"have":{"class":{"FileNameLinter":103}},"need":{"function":{"pht":307},"class":{"ArcanistLinter":126,"ArcanistLintSeverity":662,"Filesystem":968}},"xmap":{"FileNameLinter":["ArcanistLinter"]}},"9285ad9415f8ebe564f7119e5a72c559":{"have":{"class":{"FormatStringLinter":146}},"need":{"function":{"pht":377,"csprintf":1492,"id":1872},"class":{"ArcanistExternalLinter":173,"ArcanistLintMessage":1879,"Filesystem":827,"ArcanistLinter":1956,"ArcanistLintSeverity":2044}},"xmap":{"FormatStringLinter":["ArcanistExternalLinter"]}},"2e11dd9ad67e594f863bc46ac59ea37e":{"have":{"class":{"GlobalExternalLinter":199}},"need":{"class":{"ArcanistExternalLinter":228},"interface":{"ILintOnce":262}},"xmap":{"GlobalExternalLinter":["ArcanistExternalLinter","ILintOnce"]}},"b2403124ec3e8be6cb4d10bf0f6c4134":{"have":{"interface":{"ILintOnce":69}},"need":[],"xmap":[]},"1f9bac7956f4f948a187828dcc6ba2d0":{"have":{"class":{"IncludeGuardLinter":98}},"need":{"function":{"pht":368},"class":{"ArcanistLinter":125,"ArcanistLintSeverity":721,"Filesystem":970}},"xmap":{"IncludeGuardLinter":["ArcanistLinter"]}},"2cbb6e7228d81557f777ad648704f343":{"have":{"class":{"IncludeQuotesLinter":100}},"need":{"function":{"pht":306},"class":{"ArcanistLinter":128,"ArcanistLintSeverity":663,"Filesystem":964}},"xmap":{"IncludeQuotesLinter":["ArcanistLinter"]}},"f151089cf79fdb8257b2272ed4782d88":{"have":{"class":{"IncludeSourceLinter":99}},"need":{"function":{"pht":391},"class":{"ArcanistLinter":127,"ArcanistLintSeverity":699,"Filesystem":938}},"xmap":{"IncludeSourceLinter":["ArcanistLinter"]}},"ce5dee893bedb5d93466655eede8ac47":{"have":{"class":{"LocaleDependenceLinter":160}},"need":{"function":{"pht":5429},"class":{"ArcanistLinter":191,"ArcanistLintSeverity":5932,"Filesystem":6178}},"xmap":{"LocaleDependenceLinter":["ArcanistLinter"]}},"6f2f22dd0f259fb2eaa284b4fab3bc29":{"have":{"class":{"PythonFormatLinter":123}},"need":{"function":{"pht":353,"id":1838},"class":{"ArcanistExternalLinter":150,"ArcanistLintMessage":1845,"Filesystem":776,"ArcanistLinter":1970,"ArcanistLintSeverity":2053}},"xmap":{"PythonFormatLinter":["ArcanistExternalLinter"]}},"09a933fbbf135320585be52750d93831":{"have":{"class":{"StdintLinter":90}},"need":{"function":{"pht":280},"class":{"ArcanistLinter":111,"ArcanistLintSeverity":589,"Filesystem":897}},"xmap":{"StdintLinter":["ArcanistLinter"]}},"25781df78f6eebfb223296b8265e9d19":{"have":{"class":{"TestsLinter":103}},"need":{"function":{"pht":318,"id":2629},"class":{"ArcanistExternalLinter":123,"ArcanistLintMessage":2636,"Filesystem":776,"ArcanistLinter":2684,"ArcanistLintSeverity":2792}},"xmap":{"TestsLinter":["ArcanistExternalLinter"]}},"5ea58c19df0397ed8ee0f463d90d6c72":{"have":{"class":{"BoostDependenciesLinter":145}},"need":{"function":{"pht":330,"id":1440},"class":{"GlobalExternalLinter":177,"ArcanistLintMessage":1447,"Filesystem":609,"ArcanistLinter":1524,"ArcanistLintSeverity":1624}},"xmap":{"BoostDependenciesLinter":["GlobalExternalLinter"]}}}
\ No newline at end of file
+{"__symbol_cache_version__":11,"ae5b7d3d6b8cf9598ce4abaf0cd56b21":{"have":{"class":{"ExtendedConfigurationDrivenLintEngine":19}},"need":{"function":{"newv":159,"pht":933},"class":{"ArcanistLintEngine":65,"ArcanistConfigurationDrivenLintEngine":171,"PhutilConsole":866},"class\/interface":{"ILintOnce":634}},"xmap":{"ExtendedConfigurationDrivenLintEngine":["ArcanistLintEngine"]}},"2809b09d2021203b43c57da33d1fe8bf":{"have":{"class":{"AssertWithSideEffectsLinter":210}},"need":{"function":{"pht":439},"class":{"ArcanistLinter":246,"ArcanistLintSeverity":926,"Filesystem":1170}},"xmap":{"AssertWithSideEffectsLinter":["ArcanistLinter"]}},"90a8b110dc475955f15bb81d37268cb5":{"have":{"class":{"AutoPEP8FormatLinter":75}},"need":{"function":{"pht":297,"execx":769,"id":1903},"class":{"ArcanistExternalLinter":104,"ArcanistLintMessage":1910,"Filesystem":1754,"ArcanistLinter":2017,"ArcanistLintSeverity":2095}},"xmap":{"AutoPEP8FormatLinter":["ArcanistExternalLinter"]}},"5ea58c19df0397ed8ee0f463d90d6c72":{"have":{"class":{"BoostDependenciesLinter":145}},"need":{"function":{"pht":330,"id":1440},"class":{"GlobalExternalLinter":177,"ArcanistLintMessage":1447,"Filesystem":609,"ArcanistLinter":1524,"ArcanistLintSeverity":1624}},"xmap":{"BoostDependenciesLinter":["GlobalExternalLinter"]}},"38f0c676bff5192a344464142caaa253":{"have":{"class":{"CHeaderLinter":99}},"need":{"function":{"pht":611},"class":{"ArcanistLinter":121,"ArcanistLintSeverity":1060,"Filesystem":1307}},"xmap":{"CHeaderLinter":["ArcanistLinter"]}},"9bb48ec0fe2e9ced8e27d42540d0571c":{"have":{"class":{"CheckDocLinter":106}},"need":{"function":{"pht":321,"id":1845},"class":{"GlobalExternalLinter":129,"ArcanistLintMessage":1852,"Filesystem":729,"ArcanistLinter":1900,"ArcanistLintSeverity":1986}},"xmap":{"CheckDocLinter":["GlobalExternalLinter"]}},"63d19a8745cb2e1200cc26488dc7ad25":{"have":{"class":{"CheckRpcMappingsLinter":131}},"need":{"function":{"pht":310,"id":1386},"class":{"GlobalExternalLinter":162,"ArcanistLintMessage":1393,"Filesystem":573,"ArcanistLinter":1443,"ArcanistLintSeverity":1544}},"xmap":{"CheckRpcMappingsLinter":["GlobalExternalLinter"]}},"6af7410cfea496ff1d4dcc2624b6b8ea":{"have":{"class":{"ClangFormatLinter":79}},"need":{"function":{"pht":302,"execx":781,"id":1653},"class":{"ArcanistExternalLinter":105,"ArcanistLintMessage":1660,"Filesystem":1504,"ArcanistLinter":1767,"ArcanistLintSeverity":1845}},"xmap":{"ClangFormatLinter":["ArcanistExternalLinter"]}},"75579a609dd975aa0226add52700c622":{"have":{"class":{"FileNameLinter":103}},"need":{"function":{"pht":307},"class":{"ArcanistLinter":126,"ArcanistLintSeverity":662,"Filesystem":968}},"xmap":{"FileNameLinter":["ArcanistLinter"]}},"9285ad9415f8ebe564f7119e5a72c559":{"have":{"class":{"FormatStringLinter":146}},"need":{"function":{"pht":377,"csprintf":1492,"id":1872},"class":{"ArcanistExternalLinter":173,"ArcanistLintMessage":1879,"Filesystem":827,"ArcanistLinter":1956,"ArcanistLintSeverity":2044}},"xmap":{"FormatStringLinter":["ArcanistExternalLinter"]}},"2e11dd9ad67e594f863bc46ac59ea37e":{"have":{"class":{"GlobalExternalLinter":199}},"need":{"class":{"ArcanistExternalLinter":228},"interface":{"ILintOnce":262}},"xmap":{"GlobalExternalLinter":["ArcanistExternalLinter","ILintOnce"]}},"b2403124ec3e8be6cb4d10bf0f6c4134":{"have":{"interface":{"ILintOnce":69}},"need":[],"xmap":[]},"1f9bac7956f4f948a187828dcc6ba2d0":{"have":{"class":{"IncludeGuardLinter":98}},"need":{"function":{"pht":368},"class":{"ArcanistLinter":125,"ArcanistLintSeverity":721,"Filesystem":970}},"xmap":{"IncludeGuardLinter":["ArcanistLinter"]}},"2cbb6e7228d81557f777ad648704f343":{"have":{"class":{"IncludeQuotesLinter":100}},"need":{"function":{"pht":306},"class":{"ArcanistLinter":128,"ArcanistLintSeverity":663,"Filesystem":964}},"xmap":{"IncludeQuotesLinter":["ArcanistLinter"]}},"f151089cf79fdb8257b2272ed4782d88":{"have":{"class":{"IncludeSourceLinter":99}},"need":{"function":{"pht":391},"class":{"ArcanistLinter":127,"ArcanistLintSeverity":699,"Filesystem":938}},"xmap":{"IncludeSourceLinter":["ArcanistLinter"]}},"ce5dee893bedb5d93466655eede8ac47":{"have":{"class":{"LocaleDependenceLinter":160}},"need":{"function":{"pht":5429},"class":{"ArcanistLinter":191,"ArcanistLintSeverity":5932,"Filesystem":6178}},"xmap":{"LocaleDependenceLinter":["ArcanistLinter"]}},"6f2f22dd0f259fb2eaa284b4fab3bc29":{"have":{"class":{"PythonFormatLinter":123}},"need":{"function":{"pht":353,"id":1838},"class":{"ArcanistExternalLinter":150,"ArcanistLintMessage":1845,"Filesystem":776,"ArcanistLinter":1970,"ArcanistLintSeverity":2053}},"xmap":{"PythonFormatLinter":["ArcanistExternalLinter"]}},"09a933fbbf135320585be52750d93831":{"have":{"class":{"StdintLinter":90}},"need":{"function":{"pht":280},"class":{"ArcanistLinter":111,"ArcanistLintSeverity":589,"Filesystem":897}},"xmap":{"StdintLinter":["ArcanistLinter"]}},"25781df78f6eebfb223296b8265e9d19":{"have":{"class":{"TestsLinter":103}},"need":{"function":{"pht":318,"id":2629},"class":{"ArcanistExternalLinter":123,"ArcanistLintMessage":2636,"Filesystem":776,"ArcanistLinter":2684,"ArcanistLintSeverity":2792}},"xmap":{"TestsLinter":["ArcanistExternalLinter"]}},"03cf226fe177a9fce7dc046816cc466b":{"have":{"class":{"PythonOpenFileEncodingLinter":111}},"need":{"function":{"pht":325},"class":{"ArcanistLinter":148,"ArcanistLintSeverity":687,"Filesystem":991}},"xmap":{"PythonOpenFileEncodingLinter":["ArcanistLinter"]}}}
\ No newline at end of file
diff -Nru bitcoinabc-0.19.11-uahf/.arclint bitcoinabc-0.19.12-uahf/.arclint
--- bitcoinabc-0.19.11-uahf/.arclint	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.arclint	2019-08-16 12:22:07.000000000 +0000
@@ -5,7 +5,7 @@
         },
         "clang-format": {
             "type": "clang-format",
-            "version": "7.0",
+            "version": ">=7.0",
             "bin": ["clang-format-7", "clang-format"],
             "include": "(^src/.*\\.(h|c|cpp|mm)$)",
             "exclude": [
@@ -21,7 +21,7 @@
             "type": "flake8",
             "include": "(\\.py$)",
             "flags": [
-                "--select=E112,E113,E115,E116,E125,E131,E133,E223,E224,E271,E272,E273,E274,E275,E304,E306,E502,E702,E703,E714,E721,E741,E742,E743,F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F822,F823,F831,W292,W601,W602,W603,W604,W605"
+                "--select=E112,E113,E115,E116,E125,E131,E133,E223,E224,E242,E266,E271,E272,E273,E274,E275,E304,E306,E401,E402,E502,E701,E702,E703,E714,E721,E741,E742,E743,E901,E902,F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F821,F822,F823,F831,F841,W292,W293,W601,W602,W603,W604,W605,W606"
             ]
         },
         "lint-format-strings": {
@@ -127,6 +127,14 @@
         "lint-boost-dependencies": {
             "type": "lint-boost-dependencies",
             "include": "(^src/.*\\.(h|cpp)$)"
+        },
+        "check-rpc-mappings": {
+            "type": "check-rpc-mappings",
+            "include": "(^src/(rpc/|wallet/rpc).*\\.cpp$)"
+        },
+        "lint-python-encoding": {
+            "type": "lint-python-encoding",
+            "include": "(\\.py$)"
         }
     }
 }
diff -Nru bitcoinabc-0.19.11-uahf/build-aux/m4/bitcoin_find_bdb53.m4 bitcoinabc-0.19.12-uahf/build-aux/m4/bitcoin_find_bdb53.m4
--- bitcoinabc-0.19.11-uahf/build-aux/m4/bitcoin_find_bdb53.m4	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/build-aux/m4/bitcoin_find_bdb53.m4	2019-08-16 12:22:07.000000000 +0000
@@ -45,7 +45,7 @@
 
   if test "x$BDB_LIBS" = "x"; then
     # TODO: Ideally this could find the library version and make sure it matches the headers being used
-    for searchlib in db_cxx-5.3 db_cxx; do
+    for searchlib in db_cxx-5.3 db_cxx db5_cxx; do
       AC_CHECK_LIB([$searchlib],[main],[
         BDB_LIBS="-l${searchlib}"
         break
diff -Nru bitcoinabc-0.19.11-uahf/cmake/modules/AddCompilerFlags.cmake bitcoinabc-0.19.12-uahf/cmake/modules/AddCompilerFlags.cmake
--- bitcoinabc-0.19.11-uahf/cmake/modules/AddCompilerFlags.cmake	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/cmake/modules/AddCompilerFlags.cmake	2019-08-16 12:22:07.000000000 +0000
@@ -4,7 +4,7 @@
 include(SanitizeHelper)
 
 function(check_compiler_flag RESULT LANGUAGE FLAG)
-	sanitize_variable("have_${LANGUAGE}_" ${FLAG} TEST_NAME)
+	sanitize_c_cxx_definition("have_${LANGUAGE}_" ${FLAG} TEST_NAME)
 
 	if("${LANGUAGE}" STREQUAL "C")
 		CHECK_C_COMPILER_FLAG(${FLAG} ${TEST_NAME})
@@ -16,58 +16,56 @@
 	set(${RESULT} ${${TEST_NAME}} PARENT_SCOPE)
 endfunction()
 
-function(add_c_compiler_flag)
+function(add_compiler_flags_to_var TARGET LANGUAGE)
 	foreach(f ${ARGN})
-		check_compiler_flag(FLAG_IS_SUPPORTED C ${f})
-		if(${FLAG_IS_SUPPORTED})
-			string(APPEND CMAKE_C_FLAGS " ${f}")
+		# If the flag is already set, avoid duplicating it
+		string(FIND "${${TARGET}}" "${f}" FLAG_POSITION)
+		if(${FLAG_POSITION} LESS 0)
+			check_compiler_flag(FLAG_IS_SUPPORTED ${LANGUAGE} ${f})
+			if(${FLAG_IS_SUPPORTED})
+				string(APPEND ${TARGET} " ${f}")
+			endif()
 		endif()
 	endforeach()
-	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
+	set(${TARGET} ${${TARGET}} PARENT_SCOPE)
 endfunction()
 
-function(add_cxx_compiler_flag)
-	foreach(f ${ARGN})
-		check_compiler_flag(FLAG_IS_SUPPORTED CXX ${f})
-		if(${FLAG_IS_SUPPORTED})
-			string(APPEND CMAKE_CXX_FLAGS " ${f}")
-		endif()
-	endforeach()
-	set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)
-endfunction()
+macro(add_c_compiler_flags)
+	add_compiler_flags_to_var(CMAKE_C_FLAGS C ${ARGN})
+endmacro()
 
-macro(add_compiler_flag)
-	add_c_compiler_flag(${ARGN})
-	add_cxx_compiler_flag(${ARGN})
+macro(add_cxx_compiler_flags)
+	add_compiler_flags_to_var(CMAKE_CXX_FLAGS CXX ${ARGN})
 endmacro()
 
-macro(remove_c_compiler_flags)
-	if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "")
-		string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
-		set(BUILD_TYPE_C_FLAGS "CMAKE_C_FLAGS_${BUILD_TYPE}")
-	endif()
-	
+macro(add_compiler_flags)
+	add_c_compiler_flags(${ARGN})
+	add_cxx_compiler_flags(${ARGN})
+endmacro()
+
+macro(remove_compiler_flags_from_var TARGET)
 	foreach(f ${ARGN})
-		string(REGEX REPLACE "${f}( |$)" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-		if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "")
-			string(REGEX REPLACE "${f}( |$)" "" ${BUILD_TYPE_C_FLAGS} "${${BUILD_TYPE_C_FLAGS}}")
-		endif()
+		string(REGEX REPLACE "${f}( |$)" "" ${TARGET} "${${TARGET}}")
 	endforeach()
 endmacro()
 
-macro(remove_cxx_compiler_flags)
+function(remove_c_compiler_flags)
+	remove_compiler_flags_from_var(CMAKE_C_FLAGS ${ARGN})
 	if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "")
-		string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
-		set(BUILD_TYPE_CXX_FLAGS "CMAKE_CXX_FLAGS_${BUILD_TYPE}")
+		string(TOUPPER "CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}" BUILD_TYPE_FLAGS)
+		remove_compiler_flags_from_var(${BUILD_TYPE_FLAGS} ${ARGN})
 	endif()
-	
-	foreach(f ${ARGN})
-		string(REGEX REPLACE "${f}( |$)" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-		if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "")
-			string(REGEX REPLACE "${f}( |$)" "" ${BUILD_TYPE_CXX_FLAGS} "${${BUILD_TYPE_CXX_FLAGS}}")
-		endif()
-	endforeach()
-endmacro()
+	set(${BUILD_TYPE_FLAGS} ${${BUILD_TYPE_FLAGS}} PARENT_SCOPE)
+endfunction()
+
+function(remove_cxx_compiler_flags)
+	remove_compiler_flags_from_var(CMAKE_CXX_FLAGS ${ARGN})
+	if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "")
+		string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" BUILD_TYPE_FLAGS)
+		remove_compiler_flags_from_var(${BUILD_TYPE_FLAGS} ${ARGN})
+	endif()
+	set(${BUILD_TYPE_FLAGS} ${${BUILD_TYPE_FLAGS}} PARENT_SCOPE)
+endfunction()
 
 macro(remove_compiler_flags)
 	remove_c_compiler_flags(${ARGN})
@@ -78,18 +76,15 @@
 	# Remove the fallback flag if it exists, so that the main flag will override
 	# it if it was previously added.
 	remove_cxx_compiler_flags(${FALLBACK})
-	
+
 	set(FLAG_CANDIDATE ${FLAG})
 	check_compiler_flag(FLAG_IS_SUPPORTED CXX ${FLAG_CANDIDATE})
 	if(NOT ${FLAG_IS_SUPPORTED})
 		set(FLAG_CANDIDATE ${FALLBACK})
-		check_compiler_flag(FLAG_IS_SUPPORTED CXX ${FLAG_CANDIDATE})
-	endif()
-	
-	if(${FLAG_IS_SUPPORTED})
-		string(APPEND ${TARGET_VAR} " ${FLAG_CANDIDATE}")
-		set(${TARGET_VAR} ${${TARGET_VAR}} PARENT_SCOPE)
 	endif()
+
+	add_compiler_flags_to_var(${TARGET_VAR} CXX ${FLAG_CANDIDATE})
+	set(${TARGET_VAR} ${${TARGET_VAR}} PARENT_SCOPE)
 endfunction()
 
 # Note that CMake does not provide any facility to check that a linker flag is
@@ -97,17 +92,40 @@
 # However since CMake 3.2 introduced the CMP0056 policy, the
 # CMAKE_EXE_LINKER_FLAGS variable is used by the try_compile function, so there
 # is a workaround that allow for testing the linker flags.
-function(add_linker_flag)
+function(add_linker_flags)
 	foreach(f ${ARGN})
-		sanitize_variable("have_linker_" ${f} FLAG_IS_SUPPORTED)
-		
+		sanitize_c_cxx_definition("have_linker_" ${f} FLAG_IS_SUPPORTED)
+
+		# Some linkers (e.g.: Clang) will issue a -Wunused-command-line-argument
+		# warning when an unknown linker flag is set.
+		# Using -Werror will promote these warnings to errors so
+		# CHECK_CXX_COMPILER_FLAG() will return false, preventing the flag from
+		# being set.
+		add_compiler_flags_to_var(
+			CMAKE_REQUIRED_FLAGS
+			CXX
+			"-Werror=unused-command-line-argument"
+		)
+
 		# Save the current linker flags
 		set(SAVE_CMAKE_EXE_LINKERFLAGS ${CMAKE_EXE_LINKER_FLAGS})
-		string(APPEND CMAKE_EXE_LINKER_FLAGS " ${f}")
+
+		# If the flag is already set, avoid duplicating it
+		string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "${f}" FLAG_POSITION)
+		if(${FLAG_POSITION} LESS 0)
+			string(APPEND CMAKE_EXE_LINKER_FLAGS " ${f}")
+		endif()
+
 		# CHECK_CXX_COMPILER_FLAG calls CHECK_CXX_SOURCE_COMPILES which in turn
 		# calls try_compile, so it will check our flag
 		CHECK_CXX_COMPILER_FLAG("" ${FLAG_IS_SUPPORTED})
-		
+
+		# Unset the -Werror=unused-command-line-argument flag if it is set.
+		remove_compiler_flags_from_var(
+			CMAKE_REQUIRED_FLAGS
+			"-Werror=unused-command-line-argument"
+		)
+
 		# If the flag is not supported restore CMAKE_EXE_LINKER_FLAGS
 		if(NOT ${FLAG_IS_SUPPORTED})
 			set(CMAKE_EXE_LINKER_FLAGS ${SAVE_CMAKE_EXE_LINKERFLAGS})
diff -Nru bitcoinabc-0.19.11-uahf/cmake/modules/FindBerkeleyDB.cmake bitcoinabc-0.19.12-uahf/cmake/modules/FindBerkeleyDB.cmake
--- bitcoinabc-0.19.11-uahf/cmake/modules/FindBerkeleyDB.cmake	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/cmake/modules/FindBerkeleyDB.cmake	2019-08-16 12:22:07.000000000 +0000
@@ -22,7 +22,7 @@
 	HINTS ${BREW_HINT}
 )
 find_library(BDBXX_LIBRARY
-	NAMES db_cxx libdb_cxx
+	NAMES db_cxx libdb_cxx db5_cxx
 	HINTS ${BREW_HINT}
 )
 
diff -Nru bitcoinabc-0.19.11-uahf/cmake/modules/SanitizeHelper.cmake bitcoinabc-0.19.12-uahf/cmake/modules/SanitizeHelper.cmake
--- bitcoinabc-0.19.11-uahf/cmake/modules/SanitizeHelper.cmake	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/cmake/modules/SanitizeHelper.cmake	2019-08-16 12:22:07.000000000 +0000
@@ -1,3 +1,8 @@
+macro(_sanitize REPLACEMENT_REGEX REPLACEMENT_STRING RAW_VAR SANITIZED_VAR)
+	string(REGEX REPLACE
+		"${REPLACEMENT_REGEX}" "${REPLACEMENT_STRING}" ${SANITIZED_VAR} "${RAW_VAR}")
+endmacro()
+
 # Sanitize a variable according to cmake rules
 # https://cmake.org/cmake/help/v3.10/manual/cmake-language.7.html#variable-references
 # The NUL and ';' characters cannot be escaped in this context (see CMP0053)
@@ -14,6 +19,14 @@
 	# rather to replace them with a known supported one, here '_' is chosen.
 	# Not: this could lead to name collision in some rare case. These case can
 	# be handled manually by using a different prefix.
-	string(REGEX REPLACE
-		"([^a-zA-Z0-9/_.+-])" "_" ${SANITIZED_VAR} "${PREFIX}${RAW_VAR}")
+	_sanitize("([^a-zA-Z0-9/_.+-])" "_" "${PREFIX}${RAW_VAR}" ${SANITIZED_VAR})
+endmacro()
+
+# Sanitize a variable intended to be used in a C/CXX #define statement.
+# This is useful when using CHECK_<C|CXX>_COMPILER_FLAG or similar functions.
+macro(sanitize_c_cxx_definition PREFIX RAW_VAR SANITIZED_VAR)
+	# Only allow for alphanum chars plus underscore. This will prevent the
+	# compiler to issue a warning like:
+	# `ISO C99 requires whitespace after the macro name [-Wc99-extensions]`
+	_sanitize("([^a-zA-Z0-9_])" "_" "${PREFIX}${RAW_VAR}" ${SANITIZED_VAR})
 endmacro()
diff -Nru bitcoinabc-0.19.11-uahf/configure.ac bitcoinabc-0.19.12-uahf/configure.ac
--- bitcoinabc-0.19.11-uahf/configure.ac	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/configure.ac	2019-08-16 12:22:07.000000000 +0000
@@ -2,7 +2,7 @@
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 19)
-define(_CLIENT_VERSION_REVISION, 11)
+define(_CLIENT_VERSION_REVISION, 12)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
@@ -253,6 +253,7 @@
 
     AX_CHECK_PREPROC_FLAG([-DDEBUG],[[DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DDEBUG"]],,[[$CXXFLAG_WERROR]])
     AX_CHECK_PREPROC_FLAG([-DDEBUG_LOCKORDER],[[DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DDEBUG_LOCKORDER"]],,[[$CXXFLAG_WERROR]])
+    AX_CHECK_COMPILE_FLAG([-ftrapv],[DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -ftrapv"],,[[$CXXFLAG_WERROR]])
 fi
 
 if test x$use_sanitizers != x; then
@@ -285,20 +286,22 @@
 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]])
-  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]])
-  AX_CHECK_COMPILE_FLAG([-Wthread-safety-analysis],[CXXFLAGS="$CXXFLAGS -Wthread-safety-analysis"],,[[$CXXFLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wshadow],[CXXFLAGS="$CXXFLAGS -Wshadow"],,[[$CXXFLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wmissing-braces],[CXXFLAGS="$CXXFLAGS -Wmissing-braces"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wall],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wall"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wextra],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wformat],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wformat"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wvla],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wvla"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wformat-security],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wthread-safety-analysis],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wthread-safety-analysis"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wshadow],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wshadow"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wmissing-braces],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wmissing-braces"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wrange-loop-analysis],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wrange-loop-analysis"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wredundant-decls],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wredundant-decls"],,[[$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([-Wimplicit-fallthrough],[CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wunused-parameter],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-unused-parameter"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
 fi
 
 # Check for optional instruction set support. Enabling these does _not_ imply that all code will
@@ -412,25 +415,25 @@
      use_pkgconfig=no
 
      TARGET_OS=windows
-     AC_CHECK_LIB([mingwthrd],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([kernel32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([user32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([gdi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comdlg32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winspool],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winmm],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shell32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comctl32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ole32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([oleaut32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([uuid],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([rpcrt4],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([advapi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ws2_32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([mswsock],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shlwapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([iphlpapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([crypt32],      [main],, AC_MSG_ERROR(lib missing))
+     AC_CHECK_LIB([mingwthrd],      [main],, AC_MSG_ERROR(libmingwthrd missing))
+     AC_CHECK_LIB([kernel32],      [main],, AC_MSG_ERROR(libkernel32 missing))
+     AC_CHECK_LIB([user32],      [main],, AC_MSG_ERROR(libuser32 missing))
+     AC_CHECK_LIB([gdi32],      [main],, AC_MSG_ERROR(libgdi32 missing))
+     AC_CHECK_LIB([comdlg32],      [main],, AC_MSG_ERROR(libcomdlg32 missing))
+     AC_CHECK_LIB([winspool],      [main],, AC_MSG_ERROR(libwinspool missing))
+     AC_CHECK_LIB([winmm],      [main],, AC_MSG_ERROR(libwinmm missing))
+     AC_CHECK_LIB([shell32],      [main],, AC_MSG_ERROR(libshell32 missing))
+     AC_CHECK_LIB([comctl32],      [main],, AC_MSG_ERROR(libcomctl32 missing))
+     AC_CHECK_LIB([ole32],      [main],, AC_MSG_ERROR(libole32 missing))
+     AC_CHECK_LIB([oleaut32],      [main],, AC_MSG_ERROR(liboleaut32 missing))
+     AC_CHECK_LIB([uuid],      [main],, AC_MSG_ERROR(libuuid missing))
+     AC_CHECK_LIB([rpcrt4],      [main],, AC_MSG_ERROR(librpcrt4 missing))
+     AC_CHECK_LIB([advapi32],      [main],, AC_MSG_ERROR(libadvapi32 missing))
+     AC_CHECK_LIB([ws2_32],      [main],, AC_MSG_ERROR(libws2_32 missing))
+     AC_CHECK_LIB([mswsock],      [main],, AC_MSG_ERROR(libmswsock missing))
+     AC_CHECK_LIB([shlwapi],      [main],, AC_MSG_ERROR(libshlwapi missing))
+     AC_CHECK_LIB([iphlpapi],      [main],, AC_MSG_ERROR(libiphlpapi missing))
+     AC_CHECK_LIB([crypt32],      [main],, AC_MSG_ERROR(libcrypt32 missing))
 
      # -static is interpreted by libtool, where it has a different meaning.
      # In libtool-speak, it's -all-static.
@@ -534,20 +537,37 @@
      CPPFLAGS="$CPPFLAGS -DMAC_OSX"
      OBJCXXFLAGS="$CXXFLAGS"
      ;;
+   *android*)
+     dnl make sure android stays above linux for hosts like *linux-android*
+     LEVELDB_TARGET_FLAGS="-DOS_ANDROID"
+     ;;
    *linux*)
      TARGET_OS=linux
      LEVELDB_TARGET_FLAGS="-DOS_LINUX"
      ;;
+   *kfreebsd*)
+     LEVELDB_TARGET_FLAGS="-DOS_KFREEBSD"
+     ;;
    *freebsd*)
      LEVELDB_TARGET_FLAGS="-DOS_FREEBSD"
      ;;
    *openbsd*)
      LEVELDB_TARGET_FLAGS="-DOS_OPENBSD"
      ;;
+   *netbsd*)
+     LEVELDB_TARGET_FLAGS="-DOS_NETBSD"
+     ;;
+   *dragonfly*)
+     LEVELDB_TARGET_FLAGS="-DOS_DRAGONFLYBSD"
+     ;;
+   *solaris*)
+     LEVELDB_TARGET_FLAGS="-DOS_SOLARIS"
+     ;;
+   *hpux*)
+     LEVELDB_TARGET_FLAGS="-DOS_HPUX"
+     ;;
    *)
-     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}"
+     AC_MSG_ERROR(Cannot build leveldb for $host. Please file a bug report.)
      ;;
 esac
 
@@ -626,7 +646,7 @@
 
   #glibc absorbed clock_gettime in 2.17. librt (its previous location) is safe to link
   #in anyway for back-compat.
-  AC_CHECK_LIB([rt],[clock_gettime],, AC_MSG_ERROR(lib missing))
+  AC_CHECK_LIB([rt],[clock_gettime],, AC_MSG_ERROR(librt missing))
 
   #__fdelt_chk's params and return type have changed from long unsigned int to long int.
   # See which one is present here.
@@ -676,7 +696,7 @@
 
   case $host in
     *mingw*)
-       AC_CHECK_LIB([ssp],      [main],, AC_MSG_ERROR(lib missing))
+       AC_CHECK_LIB([ssp],      [main],, AC_MSG_ERROR(libssp missing))
     ;;
   esac
 fi
@@ -688,6 +708,10 @@
 
 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_CHECK_DECLS([getifaddrs, freeifaddrs],,,
+    [#include <sys/types.h>
+    #include <ifaddrs.h>]
+)
 AC_CHECK_DECLS([strnlen])
 
 # Check for daemon(3), unrelated to --with-daemon (although used by it)
@@ -774,6 +798,14 @@
  [ AC_MSG_RESULT(no)]
 )
 
+AC_MSG_CHECKING(for if type char equals int8_t)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>
+  #include <type_traits>]],
+ [[ static_assert(std::is_same<int8_t, char>::value, ""); ]])],
+ [ AC_MSG_RESULT(yes); AC_DEFINE(CHAR_EQUALS_INT8, 1,[Define this symbol if type char equals int8_t]) ],
+ [ AC_MSG_RESULT(no)]
+)
+
 # Check for reduced exports
 if test x$use_reduce_exports = xyes; then
   AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"],
@@ -1186,6 +1218,8 @@
 
 AC_SUBST(RELDFLAGS)
 AC_SUBST(DEBUG_CPPFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
+AC_SUBST(NOWARN_CXXFLAGS)
 AC_SUBST(DEBUG_CXXFLAGS)
 AC_SUBST(COMPAT_LDFLAGS)
 AC_SUBST(ERROR_CXXFLAGS)
@@ -1222,6 +1256,7 @@
 AC_CONFIG_FILES([src/config/version.h])
 AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
 AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])
+AC_CONFIG_LINKS([test/util/rpcauth-test.py:test/util/rpcauth-test.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.
@@ -1297,7 +1332,7 @@
 echo "  CFLAGS        = $CFLAGS"
 echo "  CPPFLAGS      = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CPPFLAGS"
 echo "  CXX           = $CXX"
-echo "  CXXFLAGS      = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $ERROR_CXXFLAGS $CXXFLAGS"
+echo "  CXXFLAGS      = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $CXXFLAGS"
 echo "  LDFLAGS       = $PTHREAD_CFLAGS $HARDENED_LDFLAGS $LDFLAGS"
 echo "  ARFLAGS       = $ARFLAGS"
 echo
diff -Nru bitcoinabc-0.19.11-uahf/contrib/debian/copyright bitcoinabc-0.19.12-uahf/contrib/debian/copyright
--- bitcoinabc-0.19.11-uahf/contrib/debian/copyright	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/debian/copyright	2019-08-16 12:22:07.000000000 +0000
@@ -18,6 +18,14 @@
            2017, freetrader <freetrader@tuta.io>
 License: GPL-2+
 
+Files: src/secp256k1/build-aux/m4/ax_jni_include_dir.m4
+Copyright: 2008 Don Anderson <dda@sleepycat.com>
+License: GNU-All-permissive-License
+
+Files: src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4
+Copyright: 2008 Paolo Bonzini <bonzini@gnu.org>
+License: GNU-All-permissive-License
+
 Files: src/qt/res/icons/add.png
        src/qt/res/icons/address-book.png
        src/qt/res/icons/chevron.png
@@ -111,6 +119,12 @@
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+License: GNU-All-permissive-License
+ 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.
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
diff -Nru bitcoinabc-0.19.11-uahf/contrib/devtools/circular-dependencies.py bitcoinabc-0.19.12-uahf/contrib/devtools/circular-dependencies.py
--- bitcoinabc-0.19.11-uahf/contrib/devtools/circular-dependencies.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/devtools/circular-dependencies.py	2019-08-16 12:22:07.000000000 +0000
@@ -39,7 +39,7 @@
 # TODO: implement support for multiple include directories
 for arg in sorted(files.keys()):
     module = files[arg]
-    with open(arg, 'r') as f:
+    with open(arg, 'r', encoding="utf8") as f:
         for line in f:
             match = RE.match(line)
             if match:
diff -Nru bitcoinabc-0.19.11-uahf/contrib/devtools/copyright_header.py bitcoinabc-0.19.12-uahf/contrib/devtools/copyright_header.py
--- bitcoinabc-0.19.11-uahf/contrib/devtools/copyright_header.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/devtools/copyright_header.py	2019-08-16 12:22:07.000000000 +0000
@@ -160,7 +160,7 @@
 
 
 def read_file(filename):
-    return open(os.path.abspath(filename), 'r').read()
+    return open(os.path.abspath(filename), 'r', encoding="utf8").read()
 
 
 def gather_file_info(filename):
@@ -352,14 +352,14 @@
 
 
 def read_file_lines(filename):
-    f = open(os.path.abspath(filename), 'r')
+    f = open(os.path.abspath(filename), 'r', encoding="utf8")
     file_lines = f.readlines()
     f.close()
     return file_lines
 
 
 def write_file_lines(filename, file_lines):
-    f = open(os.path.abspath(filename), 'w')
+    f = open(os.path.abspath(filename), 'w', encoding="utf8")
     f.write(''.join(file_lines))
     f.close()
 
diff -Nru bitcoinabc-0.19.11-uahf/contrib/devtools/test-security-check.py bitcoinabc-0.19.12-uahf/contrib/devtools/test-security-check.py
--- bitcoinabc-0.19.11-uahf/contrib/devtools/test-security-check.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/devtools/test-security-check.py	2019-08-16 12:22:07.000000000 +0000
@@ -11,7 +11,7 @@
 
 
 def write_testcode(filename):
-    with open(filename, 'w') as f:
+    with open(filename, 'w', encoding="utf8") as f:
         f.write('''
     #include <stdio.h>
     int main()
diff -Nru bitcoinabc-0.19.11-uahf/contrib/filter-lcov.py bitcoinabc-0.19.12-uahf/contrib/filter-lcov.py
--- bitcoinabc-0.19.11-uahf/contrib/filter-lcov.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/filter-lcov.py	2019-08-16 12:22:07.000000000 +0000
@@ -16,8 +16,8 @@
 outfile = args.outfile
 
 in_remove = False
-with open(tracefile, 'r') as f:
-    with open(outfile, 'w') as wf:
+with open(tracefile, 'r', encoding="utf8") as f:
+    with open(outfile, 'w', encoding="utf8") as wf:
         for line in f:
             for p in pattern:
                 if line.startswith("SF:") and p in line:
diff -Nru bitcoinabc-0.19.11-uahf/contrib/linearize/example-linearize.cfg bitcoinabc-0.19.12-uahf/contrib/linearize/example-linearize.cfg
--- bitcoinabc-0.19.11-uahf/contrib/linearize/example-linearize.cfg	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/linearize/example-linearize.cfg	2019-08-16 12:22:07.000000000 +0000
@@ -3,9 +3,16 @@
 rpcpassword=somepassword
 #datadir=~/.bitcoin
 host=127.0.0.1
+
+#mainnet default
 port=8332
+
+#testnet default
 #port=18332
 
+#regtest default
+#port=18443
+
 # bootstrap.dat hashlist settings (linearize-hashes)
 max_height=313000
 
diff -Nru bitcoinabc-0.19.11-uahf/contrib/linearize/linearize-data.py bitcoinabc-0.19.12-uahf/contrib/linearize/linearize-data.py
--- bitcoinabc-0.19.11-uahf/contrib/linearize/linearize-data.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/linearize/linearize-data.py	2019-08-16 12:22:07.000000000 +0000
@@ -21,8 +21,6 @@
 
 settings = {}
 
-##### Switch endian-ness #####
-
 
 def hex_switchEndian(s):
     """ Switches the endianness of a hex string (in pairs of hex chars) """
@@ -87,7 +85,7 @@
 
 def get_block_hashes(settings):
     blkindex = []
-    f = open(settings['hashlist'], "r")
+    f = open(settings['hashlist'], "r", encoding="utf8")
     for line in f:
         line = line.rstrip()
         if settings['rev_hash_bytes'] == 'true':
@@ -281,7 +279,7 @@
         print("Usage: linearize-data.py CONFIG-FILE")
         sys.exit(1)
 
-    f = open(sys.argv[1])
+    f = open(sys.argv[1], encoding="utf8")
     for line in f:
         # skip comment lines
         m = re.search(r'^\s*#', line)
diff -Nru bitcoinabc-0.19.11-uahf/contrib/linearize/linearize-hashes.py bitcoinabc-0.19.12-uahf/contrib/linearize/linearize-hashes.py
--- bitcoinabc-0.19.11-uahf/contrib/linearize/linearize-hashes.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/linearize/linearize-hashes.py	2019-08-16 12:22:07.000000000 +0000
@@ -21,8 +21,6 @@
 
 settings = {}
 
-##### Switch endian-ness #####
-
 
 def hex_switchEndian(s):
     """ Switches the endianness of a hex string (in pairs of hex chars) """
@@ -104,7 +102,7 @@
 
 def get_rpc_cookie():
     # Open the cookie file
-    with open(os.path.join(os.path.expanduser(settings['datadir']), '.cookie'), 'r') as f:
+    with open(os.path.join(os.path.expanduser(settings['datadir']), '.cookie'), 'r', encoding="ascii") as f:
         combined = f.readline()
         combined_split = combined.split(":")
         settings['rpcuser'] = combined_split[0]
@@ -116,7 +114,7 @@
         print("Usage: linearize-hashes.py CONFIG-FILE")
         sys.exit(1)
 
-    f = open(sys.argv[1])
+    f = open(sys.argv[1], encoding="utf8")
     for line in f:
         # skip comment lines
         m = re.search(r'^\s*#', line)
diff -Nru bitcoinabc-0.19.11-uahf/contrib/rpm/bitcoin.spec bitcoinabc-0.19.12-uahf/contrib/rpm/bitcoin.spec
--- bitcoinabc-0.19.11-uahf/contrib/rpm/bitcoin.spec	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/rpm/bitcoin.spec	2019-08-16 12:22:07.000000000 +0000
@@ -336,6 +336,8 @@
 %{_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}/semanage port -a -t bitcoin_port_t -p tcp 18443
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18444
 %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
 %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
 fi
@@ -355,6 +357,8 @@
 	%{_sbindir}/semanage port -d -p tcp 8333
 	%{_sbindir}/semanage port -d -p tcp 18332
 	%{_sbindir}/semanage port -d -p tcp 18333
+	%{_sbindir}/semanage port -d -p tcp 18443
+	%{_sbindir}/semanage port -d -p tcp 18444
 	for selinuxvariant in %{selinux_variants}; do
 		%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :
 	done
diff -Nru bitcoinabc-0.19.11-uahf/contrib/seeds/generate-seeds.py bitcoinabc-0.19.12-uahf/contrib/seeds/generate-seeds.py
--- bitcoinabc-0.19.11-uahf/contrib/seeds/generate-seeds.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/seeds/generate-seeds.py	2019-08-16 12:22:07.000000000 +0000
@@ -48,7 +48,7 @@
     if len(addr) > 6 and addr.endswith('.onion'):
         vchAddr = b32decode(addr[0:-6], True)
         if len(vchAddr) != 16 - len(pchOnionCat):
-            raise ValueError('Invalid onion {}'.format(s))
+            raise ValueError('Invalid onion {}'.format(vchAddr))
         return pchOnionCat + vchAddr
     elif '.' in addr:  # IPv4
         return pchIPv4 + bytearray((int(x) for x in addr.split('.')))
@@ -133,10 +133,10 @@
     g.write(
         ' * IPv4 as well as onion addresses are wrapped inside an IPv6 address accordingly.\n')
     g.write(' */\n')
-    with open(os.path.join(indir, 'nodes_main.txt'), 'r') as f:
+    with open(os.path.join(indir, 'nodes_main.txt'), 'r', encoding="utf8") as f:
         process_nodes(g, f, 'pnSeed6_main', 8333)
     g.write('\n')
-    with open(os.path.join(indir, 'nodes_test.txt'), 'r') as f:
+    with open(os.path.join(indir, 'nodes_test.txt'), 'r', encoding="utf8") as f:
         process_nodes(g, f, 'pnSeed6_test', 18333)
     g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
 
diff -Nru bitcoinabc-0.19.11-uahf/contrib/seeds/makeseeds.py bitcoinabc-0.19.12-uahf/contrib/seeds/makeseeds.py
--- bitcoinabc-0.19.11-uahf/contrib/seeds/makeseeds.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/seeds/makeseeds.py	2019-08-16 12:22:07.000000000 +0000
@@ -8,8 +8,9 @@
 
 import collections
 import dns.resolver
-import sys
 import re
+import sys
+
 NSEEDS = 512
 
 MAX_SEEDS_PER_ASN = 2
diff -Nru bitcoinabc-0.19.11-uahf/contrib/seeds/nodes_main.txt bitcoinabc-0.19.12-uahf/contrib/seeds/nodes_main.txt
--- bitcoinabc-0.19.11-uahf/contrib/seeds/nodes_main.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/seeds/nodes_main.txt	2019-08-16 12:22:07.000000000 +0000
@@ -1,15 +1,16 @@
+3.16.127.222:8333
 3.85.112.62:8333
 3.113.172.57:48433
 5.39.169.117:9334
 5.39.174.125:8333
-5.188.104.245:8333
-18.185.211.222:8333
 23.239.65.83:8333
+23.253.160.111:8333
 24.192.60.220:8333
 31.25.241.224:8333
 31.220.56.195:8333
 34.235.37.107:8333
 35.195.168.18:8333
+35.211.37.184:8333
 37.59.32.10:8433
 37.157.193.121:8333
 37.221.209.222:23333
@@ -28,50 +29,47 @@
 52.243.44.176:8333
 60.249.215.221:8333
 62.210.110.181:8333
-62.233.65.179:8333
 63.143.32.126:8433
+63.224.56.249:8333
 66.96.199.249:8333
 66.151.242.154:8333
-66.187.65.6:8333
 66.206.13.51:8335
 67.239.3.146:8333
 69.181.246.223:8333
 70.174.210.133:8333
 71.67.65.230:12502
-78.97.206.149:8333
 78.129.229.69:8333
 81.98.216.212:8333
 81.174.133.68:8333
 81.237.206.224:8353
-82.75.64.15:8333
+82.117.166.77:8331
 82.200.205.30:8331
 82.221.128.33:8364
 83.221.211.116:8333
 84.112.174.5:8222
-84.213.145.196:8333
 84.234.96.41:8333
 84.234.96.81:8333
+87.125.66.198:8333
 88.208.3.195:8331
 89.179.247.236:8333
 89.238.77.69:8334
-91.148.141.242:8333
 91.197.44.144:8333
 92.206.113.127:8333
 92.222.180.14:8343
-93.115.28.24:8333
+94.199.178.17:8343
 94.244.97.244:8533
 94.247.134.76:8333
 94.247.134.186:8333
 95.79.35.133:7333
-95.172.230.70:8333
-95.174.66.211:8334
 95.213.171.117:8333
+96.70.42.232:8333
 100.1.209.114:8333
 100.11.114.130:8333
 101.92.39.116:8334
 104.172.190.165:8333
-104.199.220.66:8333
+104.196.255.91:8333
 104.215.29.209:8333
+104.219.250.140:8633
 104.237.4.202:8333
 107.175.46.159:8334
 107.191.117.175:8333
@@ -83,15 +81,13 @@
 136.144.215.219:8133
 136.243.204.71:8333
 139.59.72.4:8333
-141.0.152.69:8333
-141.239.183.148:8333
 142.68.56.141:8333
-146.90.44.252:8333
+146.90.44.188:8333
 149.210.238.31:8333
+151.106.29.126:8333
 162.220.47.150:8333
+162.221.89.109:31451
 162.242.168.36:8333
-162.242.168.55:8333
-163.172.142.149:10020
 170.106.66.186:8333
 172.96.161.245:8333
 172.105.233.17:8333
@@ -101,16 +97,19 @@
 173.224.240.45:8333
 173.249.58.36:8333
 176.9.122.3:8333
-176.223.137.37:8335
+176.198.120.197:8333
 178.21.118.33:8333
 179.218.80.242:8333
 183.111.234.221:8333
 185.25.60.199:8331
 185.81.164.38:8333
+185.88.29.208:8333
 185.138.8.46:8333
 185.154.156.58:8333
 185.154.159.164:9991
 185.157.160.219:8333
+185.219.223.108:8333
+185.247.117.230:8333
 188.134.90.224:8333
 188.166.12.12:8333
 190.2.130.27:8333
@@ -119,9 +118,11 @@
 193.138.218.67:8333
 193.169.244.189:8333
 194.14.246.205:8444
-194.14.247.116:8333
+194.14.247.123:8333
 194.67.222.6:8333
+194.135.81.28:8333
 195.122.150.173:8333
+195.154.168.129:8333
 198.204.229.34:8333
 199.201.110.56:8334
 203.132.95.10:8334
@@ -131,7 +132,6 @@
 209.160.33.233:8333
 209.188.18.204:8334
 211.43.8.168:8335
-212.32.230.219:8333
 212.107.44.171:10333
 213.165.68.218:8333
 213.227.140.194:8333
diff -Nru bitcoinabc-0.19.11-uahf/contrib/seeds/nodes_test.txt bitcoinabc-0.19.12-uahf/contrib/seeds/nodes_test.txt
--- bitcoinabc-0.19.11-uahf/contrib/seeds/nodes_test.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/seeds/nodes_test.txt	2019-08-16 12:22:07.000000000 +0000
@@ -4,23 +4,25 @@
 35.208.33.200:18333
 35.240.206.73:18333
 47.90.87.95:18333
-51.15.47.58:18333
+47.112.107.138:18333
 51.254.176.217:18333
 52.50.169.97:8333
 52.211.211.11:18333
 54.164.241.129:8333
+63.224.56.249:18333
 70.36.125.75:18333
 74.208.103.223:18533
+81.174.133.68:18333
 94.237.73.18:18333
 94.237.73.111:18333
 103.76.36.113:18331
 106.10.34.74:18333
 107.191.117.175:18333
+109.70.144.165:19333
 116.125.120.98:18333
 116.203.106.98:18333
-118.31.42.71:18337
 120.77.82.190:18443
-159.203.10.216:18333
+157.230.240.58:18333
 163.172.131.26:18333
 167.86.77.23:18333
 171.25.222.56:28333
@@ -28,8 +30,9 @@
 172.105.233.17:18333
 178.195.36.68:18333
 188.165.218.73:18333
+188.166.81.103:11333
 193.35.108.107:18333
 193.135.10.219:18333
 194.14.247.130:18333
 194.14.247.131:18333
-206.189.188.192:18333
+195.154.177.49:18333
diff -Nru bitcoinabc-0.19.11-uahf/contrib/teamcity/build-configurations.sh bitcoinabc-0.19.12-uahf/contrib/teamcity/build-configurations.sh
--- bitcoinabc-0.19.11-uahf/contrib/teamcity/build-configurations.sh	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/teamcity/build-configurations.sh	2019-08-16 12:22:07.000000000 +0000
@@ -14,7 +14,12 @@
 
 case "$ABC_BUILD_NAME" in
   build-asan)
-    export CONFIGURE_FLAGS="--with-sanitizers=address --disable-ccache"
+    export CONFIGURE_FLAGS="--enable-debug --with-sanitizers=address --disable-ccache"
+    ./build.sh
+    ;;
+
+  build-ubsan)
+    export CONFIGURE_FLAGS="--enable-debug --with-sanitizers=undefined --disable-ccache CC=clang CXX=clang++"
     ./build.sh
     ;;
 
diff -Nru bitcoinabc-0.19.11-uahf/contrib/teamcity/build.sh bitcoinabc-0.19.12-uahf/contrib/teamcity/build.sh
--- bitcoinabc-0.19.11-uahf/contrib/teamcity/build.sh	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/contrib/teamcity/build.sh	2019-08-16 12:22:07.000000000 +0000
@@ -42,7 +42,7 @@
 rm -rf "${SAN_LOG_DIR}"/*
 
 # Sanitizers options, not used if sanitizers are not enabled
-export ASAN_OPTIONS="log_path=${SAN_LOG_DIR}/asan.log"
+export ASAN_OPTIONS="malloc_context_size=0:log_path=${SAN_LOG_DIR}/asan.log"
 export LSAN_OPTIONS="suppressions=${SAN_SUPP_DIR}/lsan:log_path=${SAN_LOG_DIR}/lsan.log"
 export TSAN_OPTIONS="suppressions=${SAN_SUPP_DIR}/tsan:log_path=${SAN_LOG_DIR}/tsan.log"
 export UBSAN_OPTIONS="suppressions=${SAN_SUPP_DIR}/ubsan:print_stacktrace=1:halt_on_error=1:log_path=${SAN_LOG_DIR}/ubsan.log"
diff -Nru bitcoinabc-0.19.11-uahf/CONTRIBUTING.md bitcoinabc-0.19.12-uahf/CONTRIBUTING.md
--- bitcoinabc-0.19.11-uahf/CONTRIBUTING.md	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/CONTRIBUTING.md	2019-08-16 12:22:07.000000000 +0000
@@ -127,7 +127,7 @@
 During submission of patches, arcanist will automatically run `arc lint` to
 enforce Bitcoin ABC code formatting standards, and often suggests changes.
 If code formatting tools do not install automatically on your system, you
-will have to install clang-format-7, autopep8 and flake8.
+will have to install clang-format-7, autopep8, flake8 and phpcs.
 
 To install clang-format-7 on Ubuntu (>= 18.04+updates) or Debian (>= 10):
 ```
@@ -136,9 +136,9 @@
 If not available in the distribution, clang-format-7 can be installed from
 https://releases.llvm.org/download.html or https://apt.llvm.org
 
-To install autopep8 and flake8 on Ubuntu:
+To install autopep8, flake8 and phpcs on Ubuntu:
 ```
-sudo apt-get install python-autopep8 flake8
+sudo apt-get install python-autopep8 flake8 php-codesniffer
 ```
 
 
diff -Nru bitcoinabc-0.19.11-uahf/debian/changelog bitcoinabc-0.19.12-uahf/debian/changelog
--- bitcoinabc-0.19.11-uahf/debian/changelog	2019-08-01 11:33:40.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/debian/changelog	2019-08-16 12:27:38.000000000 +0000
@@ -1,8 +1,14 @@
-bitcoinabc (0.19.11-uahf-bionic3) bionic; urgency=medium
+bitcoinabc (0.19.12-uahf-bionic1) bionic; urgency=medium
+
+  * Bitcoin ABC 0.19.12-uahf release.
+
+ -- Andrea Suisani (sickpig) <sickpig@gmail.com>  Fri, 16 Aug 2019 14:30:00 +0200
+
+bitcoinabc (0.19.11-uahf-bionic1) bionic; urgency=medium
 
   * Bitcoin ABC 0.19.11-uahf release.
 
- -- Andrea Suisani (sickpig) <sickpig@gmail.com>  Thu,  01 Aug 2019 13:35:00 +0200
+ -- Andrea Suisani (sickpig) <sickpig@gmail.com>  Thu,  01 Aug 2019 10:50:00 +0200
 
 bitcoinabc (0.19.10-uahf-bionic1) bionic; urgency=medium
 
diff -Nru bitcoinabc-0.19.11-uahf/doc/man/bitcoin-cli.1 bitcoinabc-0.19.12-uahf/doc/man/bitcoin-cli.1
--- bitcoinabc-0.19.11-uahf/doc/man/bitcoin-cli.1	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/man/bitcoin-cli.1	2019-08-16 12:22:07.000000000 +0000
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH BITCOIN-CLI "1" "July 2019" "bitcoin-cli v0.19.11.0" "User Commands"
+.TH BITCOIN-CLI "1" "August 2019" "bitcoin-cli v0.19.12.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v0.19.11.0
+bitcoin-cli \- manual page for bitcoin-cli v0.19.12.0
 .SH SYNOPSIS
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Bitcoin ABC\/\fR
@@ -15,7 +15,7 @@
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin ABC RPC client version v0.19.11.0
+Bitcoin ABC RPC client version v0.19.12.0
 .SH OPTIONS
 .HP
 \-?
diff -Nru bitcoinabc-0.19.11-uahf/doc/man/bitcoind.1 bitcoinabc-0.19.12-uahf/doc/man/bitcoind.1
--- bitcoinabc-0.19.11-uahf/doc/man/bitcoind.1	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/man/bitcoind.1	2019-08-16 12:22:07.000000000 +0000
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH BITCOIND "1" "July 2019" "bitcoind v0.19.11.0" "User Commands"
+.TH BITCOIND "1" "August 2019" "bitcoind v0.19.12.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v0.19.11.0
+bitcoind \- manual page for bitcoind v0.19.12.0
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin ABC Daemon\/\fR
 .SH DESCRIPTION
-Bitcoin ABC Daemon version v0.19.11.0
+Bitcoin ABC Daemon version v0.19.12.0
 .SH OPTIONS
 .HP
 \-?
@@ -23,9 +23,9 @@
 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:
-00000000000000000351a488f34e8d5f4e215836fc6022ef271eb57024968eaa,
+0000000000000000025e589b280d1d947cded3c29a7881ad9bdea722269452be,
 testnet:
-000000000000074e1e01f86773c740a6ad576f253b26d3f337b4f07c4c5209d4)
+00000000fbabb53ec6eddb3d56d3262f30dbb6549b391255090d351eccd01c24)
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
diff -Nru bitcoinabc-0.19.11-uahf/doc/man/bitcoin-qt.1 bitcoinabc-0.19.12-uahf/doc/man/bitcoin-qt.1
--- bitcoinabc-0.19.11-uahf/doc/man/bitcoin-qt.1	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/man/bitcoin-qt.1	2019-08-16 12:22:07.000000000 +0000
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH BITCOIN-QT "1" "July 2019" "bitcoin-qt v0.19.11.0" "User Commands"
+.TH BITCOIN-QT "1" "August 2019" "bitcoin-qt v0.19.12.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v0.19.11.0
+bitcoin-qt \- manual page for bitcoin-qt v0.19.12.0
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Bitcoin ABC version v0.19.11.0 (64\-bit)
+Bitcoin ABC version v0.19.12.0 (64\-bit)
 .SH OPTIONS
 .HP
 \-?
@@ -23,9 +23,9 @@
 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:
-00000000000000000351a488f34e8d5f4e215836fc6022ef271eb57024968eaa,
+0000000000000000025e589b280d1d947cded3c29a7881ad9bdea722269452be,
 testnet:
-000000000000074e1e01f86773c740a6ad576f253b26d3f337b4f07c4c5209d4)
+00000000fbabb53ec6eddb3d56d3262f30dbb6549b391255090d351eccd01c24)
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
diff -Nru bitcoinabc-0.19.11-uahf/doc/man/bitcoin-tx.1 bitcoinabc-0.19.12-uahf/doc/man/bitcoin-tx.1
--- bitcoinabc-0.19.11-uahf/doc/man/bitcoin-tx.1	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/man/bitcoin-tx.1	2019-08-16 12:22:07.000000000 +0000
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH BITCOIN-TX "1" "July 2019" "bitcoin-tx v0.19.11.0" "User Commands"
+.TH BITCOIN-TX "1" "August 2019" "bitcoin-tx v0.19.12.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v0.19.11.0
+bitcoin-tx \- manual page for bitcoin-tx v0.19.12.0
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
@@ -9,7 +9,7 @@
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Bitcoin ABC bitcoin\-tx utility version v0.19.11.0
+Bitcoin ABC bitcoin\-tx utility version v0.19.12.0
 .SH OPTIONS
 .HP
 \-?
diff -Nru bitcoinabc-0.19.11-uahf/doc/release-notes/release-notes-0.19.11.md bitcoinabc-0.19.12-uahf/doc/release-notes/release-notes-0.19.11.md
--- bitcoinabc-0.19.11-uahf/doc/release-notes/release-notes-0.19.11.md	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/release-notes/release-notes-0.19.11.md	2019-08-16 12:22:07.000000000 +0000
@@ -0,0 +1,14 @@
+Bitcoin ABC version 0.19.11 is now available from:
+
+  <https://download.bitcoinabc.org/0.19.11/>
+
+This release includes the following features and fixes:
+
+Dynamic loading of wallets
+--------------------------
+
+Previously, wallets could only be loaded at startup, by specifying `-wallet` parameters on the command line or in the bitcoin.conf file. It is now possible to load wallets dynamically at runtime by calling the `loadwallet` RPC.
+
+The wallet can be specified as file/directory basename (which must be located in the `walletdir` directory), or as an absolute path to a file/directory.
+
+This feature is currently only available through the RPC interface. Wallets loaded in this way will not display in the bitcoin-qt GUI.
diff -Nru bitcoinabc-0.19.11-uahf/doc/release-notes.md bitcoinabc-0.19.12-uahf/doc/release-notes.md
--- bitcoinabc-0.19.11-uahf/doc/release-notes.md	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/release-notes.md	2019-08-16 12:22:07.000000000 +0000
@@ -1,14 +1,9 @@
-Bitcoin ABC version 0.19.11 is now available from:
+Bitcoin ABC version 0.19.12 is now available from:
 
-  <https://download.bitcoinabc.org/0.19.11/>
+  <https://download.bitcoinabc.org/0.19.12/>
 
 This release includes the following features and fixes:
-
-Dynamic loading of wallets
---------------------------
-
-Previously, wallets could only be loaded at startup, by specifying `-wallet` parameters on the command line or in the bitcoin.conf file. It is now possible to load wallets dynamically at runtime by calling the `loadwallet` RPC.
-
-The wallet can be specified as file/directory basename (which must be located in the `walletdir` directory), or as an absolute path to a file/directory.
-
-This feature is currently only available through the RPC interface. Wallets loaded in this way will not display in the bitcoin-qt GUI.
+  - Add the `getblockstats` RPC to get statistics on a block or a block range.
+  - Logging improvements to reduce noisy network messages.
+  - Logging added during wallet rescans.
+  - Minor bug fixes, stability improvements, and typo corrections.
diff -Nru bitcoinabc-0.19.11-uahf/doc/REST-interface.md bitcoinabc-0.19.12-uahf/doc/REST-interface.md
--- bitcoinabc-0.19.11-uahf/doc/REST-interface.md	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/doc/REST-interface.md	2019-08-16 12:22:07.000000000 +0000
@@ -3,7 +3,7 @@
 
 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.
+The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet, port 18332 for testnet, and port 18443 for regtest.
 
 Supported API
 -------------
diff -Nru bitcoinabc-0.19.11-uahf/.git/config bitcoinabc-0.19.12-uahf/.git/config
--- bitcoinabc-0.19.11-uahf/.git/config	2019-08-01 08:42:39.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.git/config	2019-08-16 12:22:04.000000000 +0000
@@ -5,4 +5,4 @@
 	logallrefupdates = true
 [remote "origin"]
 	url = https://github.com/Bitcoin-ABC/bitcoin-abc.git
-	fetch = +refs/tags/v0.19.11:refs/tags/v0.19.11
+	fetch = +refs/tags/v0.19.12:refs/tags/v0.19.12
diff -Nru bitcoinabc-0.19.11-uahf/.git/HEAD bitcoinabc-0.19.12-uahf/.git/HEAD
--- bitcoinabc-0.19.11-uahf/.git/HEAD	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.git/HEAD	2019-08-16 12:22:07.000000000 +0000
@@ -1 +1 @@
-f8cbc0e2b439aa4030430a7b1ecbdafede0dd072
+29ec9c3571bedb79bb79bf297da189f82302ca36
Binary files /tmp/tmpRnuMro/BCpoeDCw23/bitcoinabc-0.19.11-uahf/.git/index and /tmp/tmpRnuMro/LR8F_I2b0w/bitcoinabc-0.19.12-uahf/.git/index differ
diff -Nru bitcoinabc-0.19.11-uahf/.git/logs/HEAD bitcoinabc-0.19.12-uahf/.git/logs/HEAD
--- bitcoinabc-0.19.11-uahf/.git/logs/HEAD	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.git/logs/HEAD	2019-08-16 12:22:07.000000000 +0000
@@ -1 +1 @@
-0000000000000000000000000000000000000000 f8cbc0e2b439aa4030430a7b1ecbdafede0dd072 Andrea Suisani <sickpig@gmail.com> 1564648962 +0200	clone: from https://github.com/Bitcoin-ABC/bitcoin-abc.git
+0000000000000000000000000000000000000000 29ec9c3571bedb79bb79bf297da189f82302ca36 Andrea Suisani <sickpig@gmail.com> 1565958127 +0200	clone: from https://github.com/Bitcoin-ABC/bitcoin-abc.git
Binary files /tmp/tmpRnuMro/BCpoeDCw23/bitcoinabc-0.19.11-uahf/.git/objects/pack/pack-177d0195f0c14dabb50b1b73927f6efe14d9aece.idx and /tmp/tmpRnuMro/LR8F_I2b0w/bitcoinabc-0.19.12-uahf/.git/objects/pack/pack-177d0195f0c14dabb50b1b73927f6efe14d9aece.idx differ
Binary files /tmp/tmpRnuMro/BCpoeDCw23/bitcoinabc-0.19.11-uahf/.git/objects/pack/pack-177d0195f0c14dabb50b1b73927f6efe14d9aece.pack and /tmp/tmpRnuMro/LR8F_I2b0w/bitcoinabc-0.19.12-uahf/.git/objects/pack/pack-177d0195f0c14dabb50b1b73927f6efe14d9aece.pack differ
Binary files /tmp/tmpRnuMro/BCpoeDCw23/bitcoinabc-0.19.11-uahf/.git/objects/pack/pack-d1d34662f0bb8a4d2a19e5befdfe4824c58f0812.idx and /tmp/tmpRnuMro/LR8F_I2b0w/bitcoinabc-0.19.12-uahf/.git/objects/pack/pack-d1d34662f0bb8a4d2a19e5befdfe4824c58f0812.idx differ
Binary files /tmp/tmpRnuMro/BCpoeDCw23/bitcoinabc-0.19.11-uahf/.git/objects/pack/pack-d1d34662f0bb8a4d2a19e5befdfe4824c58f0812.pack and /tmp/tmpRnuMro/LR8F_I2b0w/bitcoinabc-0.19.12-uahf/.git/objects/pack/pack-d1d34662f0bb8a4d2a19e5befdfe4824c58f0812.pack differ
diff -Nru bitcoinabc-0.19.11-uahf/.git/packed-refs bitcoinabc-0.19.12-uahf/.git/packed-refs
--- bitcoinabc-0.19.11-uahf/.git/packed-refs	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.git/packed-refs	2019-08-16 12:22:07.000000000 +0000
@@ -1,2 +1,2 @@
 # pack-refs with: peeled fully-peeled sorted 
-f8cbc0e2b439aa4030430a7b1ecbdafede0dd072 refs/tags/v0.19.11
+29ec9c3571bedb79bb79bf297da189f82302ca36 refs/tags/v0.19.12
diff -Nru bitcoinabc-0.19.11-uahf/.git/shallow bitcoinabc-0.19.12-uahf/.git/shallow
--- bitcoinabc-0.19.11-uahf/.git/shallow	2019-08-01 08:42:40.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/.git/shallow	2019-08-16 12:22:04.000000000 +0000
@@ -1 +1 @@
-f8cbc0e2b439aa4030430a7b1ecbdafede0dd072
+29ec9c3571bedb79bb79bf297da189f82302ca36
diff -Nru bitcoinabc-0.19.11-uahf/Makefile.am bitcoinabc-0.19.12-uahf/Makefile.am
--- bitcoinabc-0.19.11-uahf/Makefile.am	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/Makefile.am	2019-08-16 12:22:07.000000000 +0000
@@ -262,7 +262,8 @@
 	test/util/data/txcreatescript2.json \
 	test/util/data/txcreatesignv1.hex \
 	test/util/data/txcreatesignv1.json \
-	test/util/data/txcreatesignv2.hex
+	test/util/data/txcreatesignv2.hex \
+	test/util/rpcauth-test.py
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 
diff -Nru bitcoinabc-0.19.11-uahf/share/qt/extract_strings_qt.py bitcoinabc-0.19.12-uahf/share/qt/extract_strings_qt.py
--- bitcoinabc-0.19.11-uahf/share/qt/extract_strings_qt.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/share/qt/extract_strings_qt.py	2019-08-16 12:22:07.000000000 +0000
@@ -67,7 +67,7 @@
 
 messages = parse_po(out.decode('utf-8'))
 
-f = open(OUT_CPP, 'w')
+f = open(OUT_CPP, 'w', encoding="utf8")
 f.write("""
 
 #include <QtGlobal>
diff -Nru bitcoinabc-0.19.11-uahf/share/rpcauth/README.md bitcoinabc-0.19.12-uahf/share/rpcauth/README.md
--- bitcoinabc-0.19.11-uahf/share/rpcauth/README.md	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/share/rpcauth/README.md	2019-08-16 12:22:07.000000000 +0000
@@ -3,8 +3,16 @@
 
 ### [RPCAuth](/share/rpcauth) ###
 
-Create login credentials for a JSON-RPC user.
+```
+usage: rpcauth.py [-h] username [password]
 
-Usage:
+Create login credentials for a JSON-RPC user
 
-    ./rpcauth.py <username>
+positional arguments:
+  username    the username for authentication
+  password    leave empty to generate a random password or specify "-" to
+              prompt for password
+
+optional arguments:
+  -h, --help  show this help message and exit
+  ```
diff -Nru bitcoinabc-0.19.11-uahf/share/rpcauth/rpcauth.py bitcoinabc-0.19.12-uahf/share/rpcauth/rpcauth.py
--- bitcoinabc-0.19.11-uahf/share/rpcauth/rpcauth.py	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/share/rpcauth/rpcauth.py	2019-08-16 12:22:07.000000000 +0000
@@ -1,34 +1,54 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2017 The Bitcoin Core developers
+# Copyright (c) 2015-2018 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 sys
-import os
-from random import SystemRandom
-import base64
+from argparse import ArgumentParser
+from base64 import urlsafe_b64encode
+from binascii import hexlify
+from getpass import getpass
+from os import urandom
+
 import hmac
 
-if len(sys.argv) < 2:
-    sys.stderr.write('Please include username as an argument.\n')
-    sys.exit(0)
 
-username = sys.argv[1]
+def generate_salt(size):
+    """Create size byte hex salt"""
+    return hexlify(urandom(size)).decode()
+
+
+def generate_password():
+    """Create 32 byte b64 password"""
+    return urlsafe_b64encode(urandom(32)).decode('utf-8')
+
+
+def password_to_hmac(salt, password):
+    m = hmac.new(bytearray(salt, 'utf-8'),
+                 bytearray(password, 'utf-8'), 'SHA256')
+    return m.hexdigest()
+
+
+def main():
+    parser = ArgumentParser(
+        description='Create login credentials for a JSON-RPC user')
+    parser.add_argument('username', help='the username for authentication')
+    parser.add_argument(
+        'password', help='leave empty to generate a random password or specify "-" to prompt for password', nargs='?')
+    args = parser.parse_args()
 
-# This uses os.urandom() underneath
-cryptogen = SystemRandom()
+    if not args.password:
+        args.password = generate_password()
+    elif args.password == '-':
+        args.password = getpass()
 
-# Create 16 byte hex salt
-salt_sequence = [cryptogen.randrange(256) for i in range(16)]
-hexseq = list(map(hex, salt_sequence))
-salt = "".join([x[2:] for x in hexseq])
+    # Create 16 byte hex salt
+    salt = generate_salt(16)
+    password_hmac = password_to_hmac(salt, args.password)
 
-# Create 32 byte b64 password
-password = base64.urlsafe_b64encode(os.urandom(32)).decode("utf-8")
+    print('String to be appended to bitcoin.conf:')
+    print('rpcauth={0}:{1}${2}'.format(args.username, salt, password_hmac))
+    print('Your password:\n{0}'.format(args.password))
 
-m = hmac.new(bytearray(salt, 'utf-8'), bytearray(password, 'utf-8'), "SHA256")
-result = m.hexdigest()
 
-print("String to be appended to bitcoin.conf:")
-print("rpcauth=" + username + ":" + salt + "$" + result)
-print("Your password:\n" + password)
+if __name__ == '__main__':
+    main()
diff -Nru bitcoinabc-0.19.11-uahf/src/arith_uint256.cpp bitcoinabc-0.19.12-uahf/src/arith_uint256.cpp
--- bitcoinabc-0.19.11-uahf/src/arith_uint256.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/arith_uint256.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -63,16 +63,16 @@
 
 template <unsigned int BITS>
 base_uint<BITS> &base_uint<BITS>::operator*=(const base_uint &b) {
-    base_uint<BITS> a = *this;
-    *this = 0;
+    base_uint<BITS> a;
     for (int j = 0; j < WIDTH; j++) {
         uint64_t carry = 0;
         for (int i = 0; i + j < WIDTH; i++) {
-            uint64_t n = carry + pn[i + j] + (uint64_t)a.pn[j] * b.pn[i];
-            pn[i + j] = n & 0xffffffff;
+            uint64_t n = carry + a.pn[i + j] + (uint64_t)pn[j] * b.pn[i];
+            a.pn[i + j] = n & 0xffffffff;
             carry = n >> 32;
         }
     }
+    *this = a;
     return *this;
 }
 
diff -Nru bitcoinabc-0.19.11-uahf/src/bench/bench_bitcoin.cpp bitcoinabc-0.19.12-uahf/src/bench/bench_bitcoin.cpp
--- bitcoinabc-0.19.11-uahf/src/bench/bench_bitcoin.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/bench/bench_bitcoin.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -76,12 +76,12 @@
     if (!gArgs.ParseParameters(argc, argv, error)) {
         fprintf(stderr, "Error parsing command line arguments: %s\n",
                 error.c_str());
-        return false;
+        return EXIT_FAILURE;
     }
 
     if (HelpRequested(gArgs)) {
         std::cout << gArgs.GetHelpMessage();
-        return 0;
+        return EXIT_SUCCESS;
     }
 
     SHA256AutoDetect();
@@ -113,4 +113,6 @@
                                    regex_filter, is_list_only);
 
     ECC_Stop();
+
+    return EXIT_SUCCESS;
 }
diff -Nru bitcoinabc-0.19.11-uahf/src/chainparamsbase.cpp bitcoinabc-0.19.12-uahf/src/chainparamsbase.cpp
--- bitcoinabc-0.19.11-uahf/src/chainparamsbase.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/chainparamsbase.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -24,36 +24,6 @@
                  OptionsCategory::CHAINPARAMS);
 }
 
-/**
- * Main network
- */
-class CBaseMainParams : public CBaseChainParams {
-public:
-    CBaseMainParams() { nRPCPort = 8332; }
-};
-
-/**
- * Testnet (v3)
- */
-class CBaseTestNetParams : public CBaseChainParams {
-public:
-    CBaseTestNetParams() {
-        nRPCPort = 18332;
-        strDataDir = "testnet3";
-    }
-};
-
-/*
- * Regression test
- */
-class CBaseRegTestParams : public CBaseChainParams {
-public:
-    CBaseRegTestParams() {
-        nRPCPort = 18332;
-        strDataDir = "regtest";
-    }
-};
-
 static std::unique_ptr<CBaseChainParams> globalChainBaseParams;
 
 const CBaseChainParams &BaseParams() {
@@ -64,11 +34,11 @@
 std::unique_ptr<CBaseChainParams>
 CreateBaseChainParams(const std::string &chain) {
     if (chain == CBaseChainParams::MAIN)
-        return std::unique_ptr<CBaseChainParams>(new CBaseMainParams());
+        return std::make_unique<CBaseChainParams>("", 8332);
     else if (chain == CBaseChainParams::TESTNET)
-        return std::unique_ptr<CBaseChainParams>(new CBaseTestNetParams());
+        return std::make_unique<CBaseChainParams>("testnet3", 18332);
     else if (chain == CBaseChainParams::REGTEST)
-        return std::unique_ptr<CBaseChainParams>(new CBaseRegTestParams());
+        return std::make_unique<CBaseChainParams>("regtest", 18443);
     else
         throw std::runtime_error(
             strprintf("%s: Unknown chain %s.", __func__, chain));
diff -Nru bitcoinabc-0.19.11-uahf/src/chainparamsbase.h bitcoinabc-0.19.12-uahf/src/chainparamsbase.h
--- bitcoinabc-0.19.11-uahf/src/chainparamsbase.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/chainparamsbase.h	2019-08-16 12:22:07.000000000 +0000
@@ -24,9 +24,11 @@
     const std::string &DataDir() const { return strDataDir; }
     int RPCPort() const { return nRPCPort; }
 
-protected:
-    CBaseChainParams() {}
+    CBaseChainParams() = delete;
+    CBaseChainParams(const std::string &data_dir, int rpc_port)
+        : nRPCPort(rpc_port), strDataDir(data_dir) {}
 
+private:
     int nRPCPort;
     std::string strDataDir;
 };
diff -Nru bitcoinabc-0.19.11-uahf/src/chainparams.cpp bitcoinabc-0.19.12-uahf/src/chainparams.cpp
--- bitcoinabc-0.19.11-uahf/src/chainparams.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/chainparams.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -105,12 +105,12 @@
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S(
-            "000000000000000000000000000000000000000000f6201b2867470678a5a3a4");
+            "000000000000000000000000000000000000000000f82892fe397d90089a49a5");
 
         // By default assume that the signatures in ancestors of this block are
         // valid.
         consensus.defaultAssumeValid = uint256S(
-            "00000000000000000351a488f34e8d5f4e215836fc6022ef271eb57024968eaa");
+            "0000000000000000025e589b280d1d947cded3c29a7881ad9bdea722269452be");
 
         // August 1, 2017 hard fork
         consensus.uahfHeight = 478558;
@@ -268,12 +268,12 @@
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S(
-            "00000000000000000000000000000000000000000000005112a96011b35bdd86");
+            "0000000000000000000000000000000000000000000000512031dc9900995ec4");
 
         // By default assume that the signatures in ancestors of this block are
         // valid.
         consensus.defaultAssumeValid = uint256S(
-            "000000000000074e1e01f86773c740a6ad576f253b26d3f337b4f07c4c5209d4");
+            "00000000fbabb53ec6eddb3d56d3262f30dbb6549b391255090d351eccd01c24");
 
         // August 1, 2017 hard fork
         consensus.uahfHeight = 1155875;
diff -Nru bitcoinabc-0.19.11-uahf/src/chainparamsseeds.h bitcoinabc-0.19.12-uahf/src/chainparamsseeds.h
--- bitcoinabc-0.19.11-uahf/src/chainparamsseeds.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/chainparamsseeds.h	2019-08-16 12:22:07.000000000 +0000
@@ -8,18 +8,19 @@
  * IPv4 as well as onion addresses are wrapped inside an IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x10,0x7f,0xde}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x55,0x70,0x3e}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x71,0xac,0x39}, 48433},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0xa9,0x75}, 9334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0xae,0x7d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbc,0x68,0xf5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xb9,0xd3,0xde}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xef,0x41,0x53}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xfd,0xa0,0x6f}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xc0,0x3c,0xdc}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x19,0xf1,0xe0}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xdc,0x38,0xc3}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xeb,0x25,0x6b}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xc3,0xa8,0x12}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xd3,0x25,0xb8}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x3b,0x20,0x0a}, 8433},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x9d,0xc1,0x79}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xd1,0xde}, 23333},
@@ -38,50 +39,47 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xf3,0x2c,0xb0}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3c,0xf9,0xd7,0xdd}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x6e,0xb5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xe9,0x41,0xb3}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x8f,0x20,0x7e}, 8433},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0xe0,0x38,0xf9}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x60,0xc7,0xf9}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x97,0xf2,0x9a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xbb,0x41,0x06}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xce,0x0d,0x33}, 8335},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xef,0x03,0x92}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xb5,0xf6,0xdf}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0xae,0xd2,0x85}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x43,0x41,0xe6}, 12502},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x61,0xce,0x95}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x81,0xe5,0x45}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x62,0xd8,0xd4}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xae,0x85,0x44}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xed,0xce,0xe0}, 8353},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x4b,0x40,0x0f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x75,0xa6,0x4d}, 8331},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcd,0x1e}, 8331},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x80,0x21}, 8364},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xdd,0xd3,0x74}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x70,0xae,0x05}, 8222},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd5,0x91,0xc4}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xea,0x60,0x29}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xea,0x60,0x51}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x7d,0x42,0xc6}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd0,0x03,0xc3}, 8331},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xb3,0xf7,0xec}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xee,0x4d,0x45}, 8334},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x94,0x8d,0xf2}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc5,0x2c,0x90}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xce,0x71,0x7f}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xde,0xb4,0x0e}, 8343},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x73,0x1c,0x18}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xc7,0xb2,0x11}, 8343},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf4,0x61,0xf4}, 8533},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf7,0x86,0x4c}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf7,0x86,0xba}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x4f,0x23,0x85}, 7333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xac,0xe6,0x46}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xae,0x42,0xd3}, 8334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd5,0xab,0x75}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x46,0x2a,0xe8}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x64,0x01,0xd1,0x72}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x64,0x0b,0x72,0x82}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x5c,0x27,0x74}, 8334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xac,0xbe,0xa5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc7,0xdc,0x42}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc4,0xff,0x5b}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xd7,0x1d,0xd1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdb,0xfa,0x8c}, 8633},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xed,0x04,0xca}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xaf,0x2e,0x9f}, 8334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x75,0xaf}, 8333},
@@ -93,15 +91,13 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x90,0xd7,0xdb}, 8133},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0xf3,0xcc,0x47}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x3b,0x48,0x04}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x00,0x98,0x45}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xef,0xb7,0x94}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x44,0x38,0x8d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x5a,0x2c,0xfc}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x5a,0x2c,0xbc}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0xee,0x1f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0x6a,0x1d,0x7e}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xdc,0x2f,0x96}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xdd,0x59,0x6d}, 31451},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf2,0xa8,0x24}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf2,0xa8,0x37}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x8e,0x95}, 10020},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x6a,0x42,0xba}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x60,0xa1,0xf5}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xe9,0x11}, 8333},
@@ -111,16 +107,19 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xe0,0xf0,0x2d}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf9,0x3a,0x24}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x09,0x7a,0x03}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0x89,0x25}, 8335},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xc6,0x78,0xc5}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x15,0x76,0x21}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0xda,0x50,0xf2}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb7,0x6f,0xea,0xdd}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x3c,0xc7}, 8331},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x51,0xa4,0x26}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x58,0x1d,0xd0}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x8a,0x08,0x2e}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9a,0x9c,0x3a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9a,0x9f,0xa4}, 9991},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9d,0xa0,0xdb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xdb,0xdf,0x6c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf7,0x75,0xe6}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x86,0x5a,0xe0}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0x0c,0x0c}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x02,0x82,0x1b}, 8333},
@@ -129,9 +128,11 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x8a,0xda,0x43}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xa9,0xf4,0xbd}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0e,0xf6,0xcd}, 8444},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0e,0xf7,0x74}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0e,0xf7,0x7b}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x43,0xde,0x06}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x51,0x1c}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x7a,0x96,0xad}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0xa8,0x81}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xcc,0xe5,0x22}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc9,0x6e,0x38}, 8334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x84,0x5f,0x0a}, 8334},
@@ -141,7 +142,6 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xa0,0x21,0xe9}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xbc,0x12,0xcc}, 8334},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x2b,0x08,0xa8}, 8335},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x20,0xe6,0xdb}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x6b,0x2c,0xab}, 10333},
     {{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,0xe3,0x8c,0xc2}, 8333},
@@ -155,23 +155,25 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xd0,0x21,0xc8}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xf0,0xce,0x49}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x5a,0x57,0x5f}, 18333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x2f,0x3a}, 18333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x70,0x6b,0x8a}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xfe,0xb0,0xd9}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xa9,0x61}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xd3,0xd3,0x0b}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xa4,0xf1,0x81}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0xe0,0x38,0xf9}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x24,0x7d,0x4b}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xd0,0x67,0xdf}, 18533},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xae,0x85,0x44}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xed,0x49,0x12}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xed,0x49,0x6f}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x4c,0x24,0x71}, 18331},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x0a,0x22,0x4a}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x75,0xaf}, 18333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x46,0x90,0xa5}, 19333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x7d,0x78,0x62}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xcb,0x6a,0x62}, 18333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x1f,0x2a,0x47}, 18337},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x4d,0x52,0xbe}, 18443},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xcb,0x0a,0xd8}, 18333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9d,0xe6,0xf0,0x3a}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x83,0x1a}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x4d,0x17}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xab,0x19,0xde,0x38}, 28333},
@@ -179,10 +181,11 @@
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xe9,0x11}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc3,0x24,0x44}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa5,0xda,0x49}, 18333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0x51,0x67}, 11333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x23,0x6c,0x6b}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x87,0x0a,0xdb}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0e,0xf7,0x82}, 18333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0e,0xf7,0x83}, 18333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0xbd,0xbc,0xc0}, 18333}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0xb1,0x31}, 18333}
 };
 #endif // BITCOIN_CHAINPARAMSSEEDS_H
diff -Nru bitcoinabc-0.19.11-uahf/src/CMakeLists.txt bitcoinabc-0.19.12-uahf/src/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/src/CMakeLists.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/CMakeLists.txt	2019-08-16 12:22:07.000000000 +0000
@@ -61,13 +61,16 @@
 # type is selected.
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " -DDEBUG -DDEBUG_LOCKORDER")
 
+# Add -ftrapv when building in Debug
+add_compiler_flags_to_var(CMAKE_CXX_FLAGS_DEBUG CXX -ftrapv)
+
 # Ensure that WINDRES_PREPROC is enabled when using windres.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	# Ensure that WINDRES_PREPROC is enabled when using windres.
 	list(APPEND CMAKE_RC_FLAGS "-DWINDRES_PREPROC")
 
 	# Build all static so there is no dll file to distribute.
-	add_compiler_flag(-static)
+	add_compiler_flags(-static)
 endif()
 
 if(ENABLE_REDUCE_EXPORTS)
@@ -81,31 +84,31 @@
 	endif()
 
 	# Also hide symbols from static libraries
-	add_linker_flag(-Wl,--exclude-libs,ALL)
+	add_linker_flags(-Wl,--exclude-libs,ALL)
 endif()
 
 # Enable statically linking libstdc++
 if(ENABLE_STATIC_LIBSTDCXX)
-	add_linker_flag(-static-libstdc++)
+	add_linker_flags(-static-libstdc++)
 endif()
 
 # All windows code is PIC, forcing it on just adds useless compile warnings
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-	add_compiler_flag(-fPIC)
+	add_compiler_flags(-fPIC)
 endif()
 
 if(ENABLE_HARDENING)
 	# Enable stack protection
-	add_cxx_compiler_flag(-fstack-protector-all -Wstack-protector)
+	add_cxx_compiler_flags(-fstack-protector-all -Wstack-protector)
 
 	# Enable some buffer overflow checking
-	add_compiler_flag(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)
+	add_compiler_flags(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)
 
 	# Enable ASLR (these flags are primarily targeting MinGw)
-	add_linker_flag(-Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va)
+	add_linker_flags(-Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va)
 
 	# Make the relocated sections read-only
-	add_linker_flag(-Wl,-z,relro -Wl,-z,now)
+	add_linker_flags(-Wl,-z,relro -Wl,-z,now)
 
 	# CMake provides the POSITION_INDEPENDENT_CODE property to set PIC/PIE.
 	# Unfortunately setting the -pie linker flag this way require CMake >= 3.14,
@@ -121,8 +124,8 @@
 endif()
 
 # Enable warning
-add_c_compiler_flag(-Wnested-externs -Wstrict-prototypes)
-add_compiler_flag(
+add_c_compiler_flags(-Wnested-externs -Wstrict-prototypes)
+add_compiler_flags(
 	-Wall
 	-Wextra
 	-Wformat
@@ -131,17 +134,18 @@
 	-Wcast-align
 	-Wunused-parameter
 	-Wmissing-braces
-	# FIXME: Activating this flag cause cmake to fail on leveldb.
-	# -Wthread-safety-analysis
+	-Wthread-safety-analysis
 	-Wshadow
+	-Wrange-loop-analysis
+	-Wredundant-decls
 )
 
 option(EXTRA_WARNINGS "Enable extra warnings" OFF)
 if(EXTRA_WARNINGS)
-	add_cxx_compiler_flag(-Wsuggest-override)
+	add_cxx_compiler_flags(-Wsuggest-override)
 else()
-	add_compiler_flag(-Wno-unused-parameter)
-	add_compiler_flag(-Wno-implicit-fallthrough)
+	add_compiler_flags(-Wno-unused-parameter)
+	add_compiler_flags(-Wno-implicit-fallthrough)
 endif()
 
 # Create a target for OpenSSL
@@ -229,8 +233,8 @@
 	target_compile_definitions(util PRIVATE "-DFDELT_TYPE=${FDELT_TYPE}")
 
 	# Wrap some glibc functions with ours
-	add_linker_flag(-Wl,--wrap=__divmoddi4)
-	add_linker_flag(-Wl,--wrap=log2f)
+	add_linker_flags(-Wl,--wrap=__divmoddi4)
+	add_linker_flags(-Wl,--wrap=log2f)
 
 	target_sources(util PRIVATE compat/glibc_compat.cpp)
 endif()
diff -Nru bitcoinabc-0.19.11-uahf/src/config/bitcoin-config.h.cmake.in bitcoinabc-0.19.12-uahf/src/config/bitcoin-config.h.cmake.in
--- bitcoinabc-0.19.11-uahf/src/config/bitcoin-config.h.cmake.in	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/config/bitcoin-config.h.cmake.in	2019-08-16 12:22:07.000000000 +0000
@@ -45,11 +45,15 @@
 
 #cmakedefine HAVE_DECL_STRNLEN 1
 #cmakedefine HAVE_DECL_DAEMON 1
+#cmakedefine HAVE_DECL_GETIFADDRS 1
+#cmakedefine HAVE_DECL_FREEIFADDRS 1
 #cmakedefine HAVE_GETENTROPY 1
 #cmakedefine HAVE_GETENTROPY_RAND 1
 #cmakedefine HAVE_SYS_GETRANDOM 1
 #cmakedefine HAVE_SYSCTL_ARND 1
 
+#cmakedefine CHAR_EQUALS_INT8 0
+
 #cmakedefine HAVE_DECL_EVP_MD_CTX_NEW 1
 
 #cmakedefine ENABLE_WALLET 1
diff -Nru bitcoinabc-0.19.11-uahf/src/config/CMakeLists.txt bitcoinabc-0.19.12-uahf/src/config/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/src/config/CMakeLists.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/config/CMakeLists.txt	2019-08-16 12:22:07.000000000 +0000
@@ -13,7 +13,7 @@
 # Version
 set(CLIENT_VERSION_MAJOR 0 CACHE STRING "Major version number")
 set(CLIENT_VERSION_MINOR 19 CACHE STRING "Minor version number")
-set(CLIENT_VERSION_REVISION 11 CACHE STRING "Revision version number")
+set(CLIENT_VERSION_REVISION 12 CACHE STRING "Revision version number")
 set(CLIENT_VERSION_BUILD 0 CACHE STRING "Build version number")
 
 option(CLIENT_VERSION_IS_RELEASE "Build a release version" OFF)
@@ -127,6 +127,10 @@
 check_symbol_exists(getentropy "unistd.h" HAVE_GETENTROPY)
 check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY_RAND)
 
+# getifaddrs and freeifaddrs may be unavailable with some Android versions
+check_symbol_exists(getifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_GETIFADDRS)
+check_symbol_exists(freeifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_FREEIFADDRS)
+
 check_cxx_source_compiles("
 	#include <unistd.h>  /* for syscall */
 	#include <sys/syscall.h>  /* for SYS_getrandom */
@@ -146,6 +150,15 @@
 	}
 " HAVE_SYSCTL_ARND)
 
+check_cxx_source_compiles("
+    #include <cstdint>
+    #include <type_traits>
+    int main() {
+        static_assert(std::is_same<int8_t, char>::value, \"\");
+        return 0;
+    }
+" CHAR_EQUALS_INT8)
+
 # OpenSSL functionality
 set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_CRYPTO_INCLUDES})
 set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
diff -Nru bitcoinabc-0.19.11-uahf/src/init.cpp bitcoinabc-0.19.12-uahf/src/init.cpp
--- bitcoinabc-0.19.11-uahf/src/init.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/init.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -698,7 +698,7 @@
         "-checkblockindex",
         strprintf("Do a full consistency check for mapBlockIndex, "
                   "setBlockIndexCandidates, chainActive and mapBlocksUnlinked "
-                  "occasionally. Also sets -checkmempool (default: %u)",
+                  "occasionally. (default: %u)",
                   defaultChainParams->DefaultConsistencyChecks()),
         true, OptionsCategory::DEBUG_TEST);
     gArgs.AddArg("-checkmempool=<n>",
@@ -1105,7 +1105,7 @@
     // a separate counter. Once we hit a gap (or if 0 doesn't exist) start
     // removing block files.
     int nContigCounter = 0;
-    for (const std::pair<std::string, fs::path> &item : mapBlockFiles) {
+    for (const std::pair<const std::string, fs::path> &item : mapBlockFiles) {
         if (atoi(item.first) == nContigCounter) {
             nContigCounter++;
             continue;
diff -Nru bitcoinabc-0.19.11-uahf/src/key.cpp bitcoinabc-0.19.12-uahf/src/key.cpp
--- bitcoinabc-0.19.11-uahf/src/key.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/key.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -1,4 +1,5 @@
 // Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2017 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -20,47 +21,68 @@
  * These functions are taken from the libsecp256k1 distribution and are very
  * ugly.
  */
+
+/**
+ * This parses a format loosely based on a DER encoding of the ECPrivateKey type
+ * from section C.4 of SEC 1 <http://www.secg.org/sec1-v2.pdf>, with the
+ * following caveats:
+ *
+ * * The octet-length of the SEQUENCE must be encoded as 1 or 2 octets. It is
+ * not required to be encoded as one octet if it is less than 256, as DER would
+ * require.
+ * * The octet-length of the SEQUENCE must not be greater than the remaining
+ * length of the key encoding, but need not match it (i.e. the encoding may
+ * contain junk after the encoded SEQUENCE).
+ * * The privateKey OCTET STRING is zero-filled on the left to 32 octets.
+ * * Anything after the encoding of the privateKey OCTET STRING is ignored,
+ * whether or not it is validly encoded DER.
+ *
+ * out32 must point to an output buffer of length at least 32 bytes.
+ */
 static int ec_privkey_import_der(const secp256k1_context *ctx, uint8_t *out32,
                                  const uint8_t *privkey, size_t privkeylen) {
     const uint8_t *end = privkey + privkeylen;
-    int lenb = 0;
-    int len = 0;
     memset(out32, 0, 32);
     /* sequence header */
-    if (end < privkey + 1 || *privkey != 0x30) {
+    if (end - privkey < 1 || *privkey != 0x30u) {
         return 0;
     }
     privkey++;
     /* sequence length constructor */
-    if (end < privkey + 1 || !(*privkey & 0x80)) {
+    if (end - privkey < 1 || !(*privkey & 0x80u)) {
         return 0;
     }
-    lenb = *privkey & ~0x80;
+    ptrdiff_t lenb = *privkey & ~0x80u;
     privkey++;
     if (lenb < 1 || lenb > 2) {
         return 0;
     }
-    if (end < privkey + lenb) {
+    if (end - privkey < lenb) {
         return 0;
     }
     /* sequence length */
-    len = privkey[lenb - 1] | (lenb > 1 ? privkey[lenb - 2] << 8 : 0);
+    ptrdiff_t len =
+        privkey[lenb - 1] | (lenb > 1 ? privkey[lenb - 2] << 8 : 0u);
     privkey += lenb;
-    if (end < privkey + len) {
+    if (end - privkey < len) {
         return 0;
     }
     /* sequence element 0: version number (=1) */
-    if (end < privkey + 3 || privkey[0] != 0x02 || privkey[1] != 0x01 ||
-        privkey[2] != 0x01) {
+    if (end - privkey < 3 || privkey[0] != 0x02u || privkey[1] != 0x01u ||
+        privkey[2] != 0x01u) {
         return 0;
     }
     privkey += 3;
     /* sequence element 1: octet string, up to 32 bytes */
-    if (end < privkey + 2 || privkey[0] != 0x04 || privkey[1] > 0x20 ||
-        end < privkey + 2 + privkey[1]) {
+    if (end - privkey < 2 || privkey[0] != 0x04u) {
         return 0;
     }
-    memcpy(out32 + 32 - privkey[1], privkey + 2, privkey[1]);
+    ptrdiff_t oslen = privkey[1];
+    privkey += 2;
+    if (oslen > 32 || end - privkey < oslen) {
+        return 0;
+    }
+    memcpy(out32 + (32 - oslen), privkey, oslen);
     if (!secp256k1_ec_seckey_verify(ctx, out32)) {
         memset(out32, 0, 32);
         return 0;
@@ -68,9 +90,20 @@
     return 1;
 }
 
+/**
+ * This serializes to a DER encoding of the ECPrivateKey type from section C.4
+ * of SEC 1 <http://www.secg.org/sec1-v2.pdf>. The optional parameters and
+ * publicKey fields are included.
+ *
+ * privkey must point to an output buffer of length at least
+ * CKey::PRIVATE_KEY_SIZE bytes. privkeylen must initially be set to the size of
+ * the privkey buffer. Upon return it will be set to the number of bytes used in
+ * the buffer. key32 must point to a 32-byte raw private key.
+ */
 static int ec_privkey_export_der(const secp256k1_context *ctx, uint8_t *privkey,
                                  size_t *privkeylen, const uint8_t *key32,
                                  int compressed) {
+    assert(*privkeylen >= CKey::PRIVATE_KEY_SIZE);
     secp256k1_pubkey pubkey;
     size_t pubkeylen = 0;
     if (!secp256k1_ec_pubkey_create(ctx, &pubkey, key32)) {
@@ -102,11 +135,12 @@
         ptr += 32;
         memcpy(ptr, middle, sizeof(middle));
         ptr += sizeof(middle);
-        pubkeylen = 33;
+        pubkeylen = CPubKey::COMPRESSED_PUBLIC_KEY_SIZE;
         secp256k1_ec_pubkey_serialize(ctx, ptr, &pubkeylen, &pubkey,
                                       SECP256K1_EC_COMPRESSED);
         ptr += pubkeylen;
         *privkeylen = ptr - privkey;
+        assert(*privkeylen == CKey::COMPRESSED_PRIVATE_KEY_SIZE);
     } else {
         static const uint8_t begin[] = {0x30, 0x82, 0x01, 0x13, 0x02,
                                         0x01, 0x01, 0x04, 0x20};
@@ -134,11 +168,12 @@
         ptr += 32;
         memcpy(ptr, middle, sizeof(middle));
         ptr += sizeof(middle);
-        pubkeylen = 65;
+        pubkeylen = CPubKey::PUBLIC_KEY_SIZE;
         secp256k1_ec_pubkey_serialize(ctx, ptr, &pubkeylen, &pubkey,
                                       SECP256K1_EC_UNCOMPRESSED);
         ptr += pubkeylen;
         *privkeylen = ptr - privkey;
+        assert(*privkeylen == CKey::PRIVATE_KEY_SIZE);
     }
     return 1;
 }
@@ -160,8 +195,8 @@
     CPrivKey privkey;
     int ret;
     size_t privkeylen;
-    privkey.resize(279);
-    privkeylen = 279;
+    privkey.resize(PRIVATE_KEY_SIZE);
+    privkeylen = PRIVATE_KEY_SIZE;
     ret = ec_privkey_export_der(
         secp256k1_context_sign, (uint8_t *)privkey.data(), &privkeylen, begin(),
         fCompressed ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED);
@@ -173,7 +208,7 @@
 CPubKey CKey::GetPubKey() const {
     assert(fValid);
     secp256k1_pubkey pubkey;
-    size_t clen = 65;
+    size_t clen = CPubKey::PUBLIC_KEY_SIZE;
     CPubKey result;
     int ret =
         secp256k1_ec_pubkey_create(secp256k1_context_sign, &pubkey, begin());
@@ -191,8 +226,8 @@
     if (!fValid) {
         return false;
     }
-    vchSig.resize(72);
-    size_t nSigLen = 72;
+    vchSig.resize(CPubKey::SIGNATURE_SIZE);
+    size_t nSigLen = CPubKey::SIGNATURE_SIZE;
     uint8_t extra_entropy[32] = {0};
     WriteLE32(extra_entropy, test_case);
     secp256k1_ecdsa_signature sig;
@@ -244,7 +279,7 @@
     if (!fValid) {
         return false;
     }
-    vchSig.resize(65);
+    vchSig.resize(CPubKey::COMPACT_SIGNATURE_SIZE);
     int rec = -1;
     secp256k1_ecdsa_recoverable_signature sig;
     int ret = secp256k1_ecdsa_sign_recoverable(
@@ -281,10 +316,10 @@
     std::vector<uint8_t, secure_allocator<uint8_t>> vout(64);
     if ((nChild >> 31) == 0) {
         CPubKey pubkey = GetPubKey();
-        assert(pubkey.begin() + 33 == pubkey.end());
+        assert(pubkey.size() == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE);
         BIP32Hash(cc, nChild, *pubkey.begin(), pubkey.begin() + 1, vout.data());
     } else {
-        assert(begin() + 32 == end());
+        assert(size() == 32);
         BIP32Hash(cc, nChild, 0, begin(), vout.data());
     }
     memcpy(ccChild.begin(), vout.data() + 32, 32);
diff -Nru bitcoinabc-0.19.11-uahf/src/key.h bitcoinabc-0.19.12-uahf/src/key.h
--- bitcoinabc-0.19.11-uahf/src/key.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/key.h	2019-08-16 12:22:07.000000000 +0000
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2017 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -15,24 +16,28 @@
 #include <vector>
 
 /**
- * secp256k1:
- * const unsigned int PRIVATE_KEY_SIZE = 279;
- * const unsigned int PUBLIC_KEY_SIZE  = 65;
- * const unsigned int SIGNATURE_SIZE   = 72;
- *
- * see www.keylength.com
- * script supports up to 75 for single byte push
- */
-
-/**
  * secure_allocator is defined in allocators.h
- * CPrivKey is a serialized private key, with all parameters included (279
- * bytes)
+ * CPrivKey is a serialized private key, with all parameters included
+ * (PRIVATE_KEY_SIZE bytes)
  */
 typedef std::vector<uint8_t, secure_allocator<uint8_t>> CPrivKey;
 
 /** An encapsulated secp256k1 private key. */
 class CKey {
+public:
+    /**
+     * secp256k1:
+     */
+    static const unsigned int PRIVATE_KEY_SIZE = 279;
+    static const unsigned int COMPRESSED_PRIVATE_KEY_SIZE = 214;
+    /**
+     * see www.keylength.com
+     * script supports up to 75 for single byte push
+     */
+    static_assert(
+        PRIVATE_KEY_SIZE >= COMPRESSED_PRIVATE_KEY_SIZE,
+        "COMPRESSED_PRIVATE_KEY_SIZE is larger than PRIVATE_KEY_SIZE");
+
 private:
     //! Whether this private key is valid. We check for correctness when
     //! modifying the key data, so fValid should always correspond to the actual
diff -Nru bitcoinabc-0.19.11-uahf/src/keystore.cpp bitcoinabc-0.19.12-uahf/src/keystore.cpp
--- bitcoinabc-0.19.11-uahf/src/keystore.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/keystore.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -118,7 +118,7 @@
     CScript::const_iterator pc = dest.begin();
     opcodetype opcode;
     std::vector<uint8_t> vch;
-    if (!dest.GetOp(pc, opcode, vch) || vch.size() < 33 || vch.size() > 65) {
+    if (!dest.GetOp(pc, opcode, vch) || !CPubKey::ValidSize(vch)) {
         return false;
     }
     pubKeyOut = CPubKey(vch);
diff -Nru bitcoinabc-0.19.11-uahf/src/leveldb/CMakeLists.txt bitcoinabc-0.19.12-uahf/src/leveldb/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/src/leveldb/CMakeLists.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/leveldb/CMakeLists.txt	2019-08-16 12:22:07.000000000 +0000
@@ -9,8 +9,8 @@
 set(CMAKE_CXX_STANDARD 11)
 
 # Remove some warnings for leveldb as they can get noisy.
-add_compiler_flag(-Wno-sign-compare -Wno-implicit-fallthrough)
-add_c_compiler_flag(-Wno-strict-prototypes)
+add_compiler_flags(-Wno-sign-compare -Wno-implicit-fallthrough)
+add_c_compiler_flags(-Wno-strict-prototypes)
 remove_compiler_flags(-Wstrict-prototypes)
 
 include(CheckIncludeFileCXX)
@@ -101,6 +101,8 @@
 		set(LEVELDB_OS SOLARIS)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 		set(LEVELDB_OS FREEBSD)
+	elseif(${CMAKE_SYSTEM_NAME} MATCHES "KFreeBSD")
+		set(LEVELDB_OS KFREEBSD)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 		set(LEVELDB_OS NETBSD)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
@@ -116,8 +118,7 @@
 		# No idea what's the proper system name is here.
 		set(LEVELDB_OS IOS)
 	else()
-		# Unknown plateform, assume linux.
-		set(LEVELDB_OS LINUX)
+		message(FATAL_ERROR "Cannot build leveldb for ${CMAKE_SYSTEM_NAME}. Please file a bug report.")
 	endif()
 endif()
 
diff -Nru bitcoinabc-0.19.11-uahf/src/Makefile.am bitcoinabc-0.19.12-uahf/src/Makefile.am
--- bitcoinabc-0.19.11-uahf/src/Makefile.am	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/Makefile.am	2019-08-16 12:22:07.000000000 +0000
@@ -5,7 +5,7 @@
 DIST_SUBDIRS = secp256k1 univalue
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(SANITIZER_LDFLAGS)
-AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) $(SANITIZER_CXXFLAGS)
+AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(SANITIZER_CXXFLAGS)
 AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS)
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 EXTRA_LIBRARIES =
diff -Nru bitcoinabc-0.19.11-uahf/src/Makefile.test.include bitcoinabc-0.19.12-uahf/src/Makefile.test.include
--- bitcoinabc-0.19.11-uahf/src/Makefile.test.include	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/Makefile.test.include	2019-08-16 12:22:07.000000000 +0000
@@ -201,6 +201,8 @@
 check-local: $(BITCOIN_TESTS:.cpp=.cpp.test)
 	@echo "Running test/util/bitcoin-util-test.py..."
 	$(top_builddir)/test/util/bitcoin-util-test.py
+	@echo "Running test/util/rpcauth-test.py..."
+	$(top_builddir)/test/util/rpcauth-test.py
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
 if EMBEDDED_UNIVALUE
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
diff -Nru bitcoinabc-0.19.11-uahf/src/miner.cpp bitcoinabc-0.19.12-uahf/src/miner.cpp
--- bitcoinabc-0.19.11-uahf/src/miner.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/miner.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -289,7 +289,7 @@
 bool BlockAssembler::TestPackageTransactions(
     const CTxMemPool::setEntries &package) {
     uint64_t nPotentialBlockSize = nBlockSize;
-    for (const CTxMemPool::txiter it : package) {
+    for (CTxMemPool::txiter it : package) {
         CValidationState state;
         if (!ContextualCheckTransaction(*config, it->GetTx(), state, nHeight,
                                         nLockTimeCutoff, nMedianTimePast)) {
@@ -378,7 +378,7 @@
     const CTxMemPool::setEntries &alreadyAdded,
     indexed_modified_transaction_set &mapModifiedTx) {
     int nDescendantsUpdated = 0;
-    for (const CTxMemPool::txiter it : alreadyAdded) {
+    for (CTxMemPool::txiter it : alreadyAdded) {
         CTxMemPool::setEntries descendants;
         mempool->CalculateDescendants(it, descendants);
         // Insert all descendants (not yet in block) into the modified set.
@@ -420,7 +420,7 @@
 }
 
 void BlockAssembler::SortForBlock(
-    const CTxMemPool::setEntries &package, CTxMemPool::txiter entry,
+    const CTxMemPool::setEntries &package,
     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
@@ -495,7 +495,8 @@
             // 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))) {
+                CompareTxMemPoolEntryByAncestorFee()(
+                    *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;
@@ -569,7 +570,7 @@
 
         // Package can be added. Sort the entries in a valid order.
         std::vector<CTxMemPool::txiter> sortedEntries;
-        SortForBlock(ancestors, iter, sortedEntries);
+        SortForBlock(ancestors, sortedEntries);
 
         for (auto &entry : sortedEntries) {
             AddToBlock(entry);
diff -Nru bitcoinabc-0.19.11-uahf/src/miner.h bitcoinabc-0.19.12-uahf/src/miner.h
--- bitcoinabc-0.19.11-uahf/src/miner.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/miner.h	2019-08-16 12:22:07.000000000 +0000
@@ -53,6 +53,12 @@
         nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();
     }
 
+    Amount GetModifiedFee() const { return iter->GetModifiedFee(); }
+    uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
+    Amount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }
+    size_t GetTxSize() const { return iter->GetTxSize(); }
+    const CTransaction &GetTx() const { return iter->GetTx(); }
+
     CTxMemPool::txiter iter;
     uint64_t nSizeWithAncestors;
     Amount nModFeesWithAncestors;
@@ -79,21 +85,6 @@
     }
 };
 
-// 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) const {
-        double f1 = b.nSizeWithAncestors * (a.nModFeesWithAncestors / SATOSHI);
-        double f2 = a.nSizeWithAncestors * (b.nModFeesWithAncestors / SATOSHI);
-        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.
@@ -117,7 +108,7 @@
             // Reuse same tag from CTxMemPool's similar index
             boost::multi_index::tag<ancestor_score>,
             boost::multi_index::identity<CTxMemPoolModifiedEntry>,
-            CompareModifiedEntry>>>
+            CompareTxMemPoolEntryByAncestorFee>>>
     indexed_modified_transaction_set;
 
 typedef indexed_modified_transaction_set::nth_index<0>::type::iterator
@@ -184,7 +175,7 @@
 
     // Methods for how to add transactions to a block.
     /** Add transactions based on tx "priority" */
-    void addPriorityTxs();
+    void addPriorityTxs() EXCLUSIVE_LOCKS_REQUIRED(mempool->cs);
     /**
      * Add transactions based on feerate including unconfirmed ancestors.
      * Increments nPackagesSelected / nDescendantsUpdated with corresponding
@@ -204,7 +195,8 @@
     /** Test if tx will still "fit" in the block */
     TestForBlockResult TestForBlock(CTxMemPool::txiter iter);
     /** Test if tx still has unconfirmed parents not yet in block */
-    bool isStillDependent(CTxMemPool::txiter iter);
+    bool isStillDependent(CTxMemPool::txiter iter)
+        EXCLUSIVE_LOCKS_REQUIRED(mempool->cs);
 
     // helper functions for addPackageTxs()
     /** Remove confirmed (inBlock) entries from given set */
@@ -228,7 +220,6 @@
         EXCLUSIVE_LOCKS_REQUIRED(mempool->cs);
     /** 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
diff -Nru bitcoinabc-0.19.11-uahf/src/netbase.cpp bitcoinabc-0.19.12-uahf/src/netbase.cpp
--- bitcoinabc-0.19.11-uahf/src/netbase.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/netbase.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -12,6 +12,8 @@
 #include <util.h>
 #include <utilstrencodings.h>
 
+#include <tinyformat.h>
+
 #include <atomic>
 
 #ifndef WIN32
@@ -522,8 +524,19 @@
     return hSocket;
 }
 
+template <typename... Args>
+static void LogConnectFailure(bool manual_connection, const char *fmt,
+                              const Args &... args) {
+    std::string error_message = tfm::format(fmt, args...);
+    if (manual_connection) {
+        LogPrintf("%s\n", error_message);
+    } else {
+        LogPrint(BCLog::NET, "%s\n", error_message);
+    }
+}
+
 bool ConnectSocketDirectly(const CService &addrConnect, const SOCKET &hSocket,
-                           int nTimeout) {
+                           int nTimeout, bool manual_connection) {
     struct sockaddr_storage sockaddr;
     socklen_t len = sizeof(sockaddr);
     if (hSocket == INVALID_SOCKET) {
@@ -567,8 +580,10 @@
                 return false;
             }
             if (nRet != 0) {
-                LogPrintf("connect() to %s failed after select(): %s\n",
-                          addrConnect.ToString(), NetworkErrorString(nRet));
+                LogConnectFailure(manual_connection,
+                                  "connect() to %s failed after select(): %s",
+                                  addrConnect.ToString(),
+                                  NetworkErrorString(nRet));
                 return false;
             }
         }
@@ -578,8 +593,9 @@
         else
 #endif
         {
-            LogPrintf("connect() to %s failed: %s\n", addrConnect.ToString(),
-                      NetworkErrorString(WSAGetLastError()));
+            LogConnectFailure(manual_connection, "connect() to %s failed: %s",
+                              addrConnect.ToString(),
+                              NetworkErrorString(WSAGetLastError()));
             return false;
         }
     }
@@ -643,7 +659,7 @@
                          int port, const SOCKET &hSocket, int nTimeout,
                          bool *outProxyConnectionFailed) {
     // first connect to proxy server
-    if (!ConnectSocketDirectly(proxy.proxy, hSocket, nTimeout)) {
+    if (!ConnectSocketDirectly(proxy.proxy, hSocket, nTimeout, true)) {
         if (outProxyConnectionFailed) {
             *outProxyConnectionFailed = true;
         }
@@ -663,6 +679,7 @@
     }
     return true;
 }
+
 bool LookupSubNet(const char *pszName, CSubNet &ret) {
     std::string strSubnet(pszName);
     size_t slash = strSubnet.find_last_of('/');
diff -Nru bitcoinabc-0.19.11-uahf/src/netbase.h bitcoinabc-0.19.12-uahf/src/netbase.h
--- bitcoinabc-0.19.11-uahf/src/netbase.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/netbase.h	2019-08-16 12:22:07.000000000 +0000
@@ -57,7 +57,8 @@
 bool LookupSubNet(const char *pszName, CSubNet &subnet);
 SOCKET CreateSocket(const CService &addrConnect);
 bool ConnectSocketDirectly(const CService &addrConnect,
-                           const SOCKET &hSocketRet, int nTimeout);
+                           const SOCKET &hSocketRet, int nTimeout,
+                           bool manual_connection);
 bool ConnectThroughProxy(const proxyType &proxy, const std::string &strDest,
                          int port, const SOCKET &hSocketRet, int nTimeout,
                          bool *outProxyConnectionFailed);
diff -Nru bitcoinabc-0.19.11-uahf/src/net.cpp bitcoinabc-0.19.12-uahf/src/net.cpp
--- bitcoinabc-0.19.11-uahf/src/net.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/net.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -361,7 +361,7 @@
 }
 
 CNode *CConnman::ConnectNode(CAddress addrConnect, const char *pszDest,
-                             bool fCountFailure) {
+                             bool fCountFailure, bool manual_connection) {
     if (pszDest == nullptr) {
         if (IsLocal(addrConnect)) {
             return nullptr;
@@ -433,8 +433,8 @@
             if (hSocket == INVALID_SOCKET) {
                 return nullptr;
             }
-            connected =
-                ConnectSocketDirectly(addrConnect, hSocket, nConnectTimeout);
+            connected = ConnectSocketDirectly(
+                addrConnect, hSocket, nConnectTimeout, manual_connection);
         }
         if (!proxyConnectionFailed) {
             // If a connection to the node was attempted, and failure (if any)
@@ -2120,7 +2120,8 @@
         return;
     }
 
-    CNode *pnode = ConnectNode(addrConnect, pszDest, fCountFailure);
+    CNode *pnode =
+        ConnectNode(addrConnect, pszDest, fCountFailure, manual_connection);
 
     if (!pnode) {
         return;
@@ -2300,7 +2301,7 @@
             }
         }
     }
-#else
+#elif (HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS)
     // Get local host ip
     struct ifaddrs *myaddrs;
     if (getifaddrs(&myaddrs) == 0) {
diff -Nru bitcoinabc-0.19.11-uahf/src/net.h bitcoinabc-0.19.12-uahf/src/net.h
--- bitcoinabc-0.19.11-uahf/src/net.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/net.h	2019-08-16 12:22:07.000000000 +0000
@@ -353,7 +353,7 @@
 
     bool AttemptToEvictConnection();
     CNode *ConnectNode(CAddress addrConnect, const char *pszDest,
-                       bool fCountFailure);
+                       bool fCountFailure, bool manual_connection);
     bool IsWhitelistedRange(const CNetAddr &addr);
 
     void DeleteNode(CNode *pnode);
diff -Nru bitcoinabc-0.19.11-uahf/src/net_processing.cpp bitcoinabc-0.19.12-uahf/src/net_processing.cpp
--- bitcoinabc-0.19.11-uahf/src/net_processing.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/net_processing.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -1830,6 +1830,7 @@
                 LogPrint(BCLog::NET, "Unparseable reject message received\n");
             }
         }
+        return true;
     }
 
     else if (strCommand == NetMsgType::VERSION) {
diff -Nru bitcoinabc-0.19.11-uahf/src/policy/policy.cpp bitcoinabc-0.19.12-uahf/src/policy/policy.cpp
--- bitcoinabc-0.19.11-uahf/src/policy/policy.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/policy/policy.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -38,20 +38,6 @@
     return (txout.nValue < GetDustThreshold(txout, dustRelayFeeIn));
 }
 
-/**
- * Check transaction inputs to mitigate two potential denial-of-service attacks:
- *
- * 1. scriptSigs with extra data stuffed into them, not consumed by scriptPubKey
- * (or P2SH script)
- * 2. P2SH scripts with a crazy number of expensive CHECKSIG/CHECKMULTISIG
- * operations
- *
- * Why bother? To avoid denial-of-service attacks; an attacker can submit a
- * standard HASH... OP_EQUAL transaction, which will get accepted into blocks.
- * The redemption script can be anything; an attacker could use a very
- * expensive-to-check-upon-redemption script like:
- *   DUP CHECKSIG DROP ... repeated 100 times... OP_1
- */
 bool IsStandard(const CScript &scriptPubKey, txnouttype &whichType) {
     std::vector<std::vector<uint8_t>> vSolutions;
     if (!Solver(scriptPubKey, whichType, vSolutions)) {
@@ -134,6 +120,22 @@
     return true;
 }
 
+/**
+ * Check transaction inputs to mitigate two
+ * potential denial-of-service attacks:
+ *
+ * 1. scriptSigs with extra data stuffed into them,
+ *    not consumed by scriptPubKey (or P2SH script)
+ * 2. P2SH scripts with a crazy number of expensive
+ *    CHECKSIG/CHECKMULTISIG operations
+ *
+ * Why bother? To avoid denial-of-service attacks; an attacker
+ * can submit a standard HASH... OP_EQUAL transaction,
+ * which will get accepted into blocks. The redemption
+ * script can be anything; an attacker could use a very
+ * expensive-to-check-upon-redemption script like:
+ *   DUP CHECKSIG DROP ... repeated 100 times... OP_1
+ */
 bool AreInputsStandard(const CTransaction &tx,
                        const CCoinsViewCache &mapInputs) {
     if (tx.IsCoinBase()) {
diff -Nru bitcoinabc-0.19.11-uahf/src/pubkey.cpp bitcoinabc-0.19.12-uahf/src/pubkey.cpp
--- bitcoinabc-0.19.11-uahf/src/pubkey.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/pubkey.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -1,4 +1,5 @@
 // Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2017 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -50,7 +51,7 @@
     lenbyte = input[pos++];
     if (lenbyte & 0x80) {
         lenbyte -= 0x80;
-        if (pos + lenbyte > inputlen) {
+        if (lenbyte > inputlen - pos) {
             return 0;
         }
         pos += lenbyte;
@@ -69,14 +70,15 @@
     lenbyte = input[pos++];
     if (lenbyte & 0x80) {
         lenbyte -= 0x80;
-        if (pos + lenbyte > inputlen) {
+        if (lenbyte > inputlen - pos) {
             return 0;
         }
         while (lenbyte > 0 && input[pos] == 0) {
             pos++;
             lenbyte--;
         }
-        if (lenbyte >= sizeof(size_t)) {
+        static_assert(sizeof(size_t) >= 4, "size_t too small");
+        if (lenbyte >= 4) {
             return 0;
         }
         rlen = 0;
@@ -107,14 +109,15 @@
     lenbyte = input[pos++];
     if (lenbyte & 0x80) {
         lenbyte -= 0x80;
-        if (pos + lenbyte > inputlen) {
+        if (lenbyte > inputlen - pos) {
             return 0;
         }
         while (lenbyte > 0 && input[pos] == 0) {
             pos++;
             lenbyte--;
         }
-        if (lenbyte >= sizeof(size_t)) {
+        static_assert(sizeof(size_t) >= 4, "size_t too small");
+        if (lenbyte >= 4) {
             return 0;
         }
         slen = 0;
@@ -214,7 +217,7 @@
 
 bool CPubKey::RecoverCompact(const uint256 &hash,
                              const std::vector<uint8_t> &vchSig) {
-    if (vchSig.size() != 65) {
+    if (vchSig.size() != COMPACT_SIGNATURE_SIZE) {
         return false;
     }
 
@@ -230,8 +233,8 @@
                                  hash.begin())) {
         return false;
     }
-    uint8_t pub[65];
-    size_t publen = 65;
+    uint8_t pub[PUBLIC_KEY_SIZE];
+    size_t publen = PUBLIC_KEY_SIZE;
     secp256k1_ec_pubkey_serialize(
         secp256k1_context_verify, pub, &publen, &pubkey,
         fComp ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED);
@@ -257,8 +260,8 @@
                                    &(*this)[0], size())) {
         return false;
     }
-    uint8_t pub[65];
-    size_t publen = 65;
+    uint8_t pub[PUBLIC_KEY_SIZE];
+    size_t publen = PUBLIC_KEY_SIZE;
     secp256k1_ec_pubkey_serialize(secp256k1_context_verify, pub, &publen,
                                   &pubkey, SECP256K1_EC_UNCOMPRESSED);
     Set(pub, pub + publen);
@@ -269,7 +272,7 @@
                      unsigned int nChild, const ChainCode &cc) const {
     assert(IsValid());
     assert((nChild >> 31) == 0);
-    assert(begin() + 33 == end());
+    assert(size() == COMPRESSED_PUBLIC_KEY_SIZE);
     uint8_t out[64];
     BIP32Hash(cc, nChild, *begin(), begin() + 1, out);
     memcpy(ccChild.begin(), out + 32, 32);
@@ -282,8 +285,8 @@
                                        out)) {
         return false;
     }
-    uint8_t pub[33];
-    size_t publen = 33;
+    uint8_t pub[COMPRESSED_PUBLIC_KEY_SIZE];
+    size_t publen = COMPRESSED_PUBLIC_KEY_SIZE;
     secp256k1_ec_pubkey_serialize(secp256k1_context_verify, pub, &publen,
                                   &pubkey, SECP256K1_EC_COMPRESSED);
     pubkeyChild.Set(pub, pub + publen);
@@ -298,8 +301,8 @@
     code[7] = (nChild >> 8) & 0xFF;
     code[8] = (nChild >> 0) & 0xFF;
     memcpy(code + 9, chaincode.begin(), 32);
-    assert(pubkey.size() == 33);
-    memcpy(code + 41, pubkey.begin(), 33);
+    assert(pubkey.size() == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE);
+    memcpy(code + 41, pubkey.begin(), CPubKey::COMPRESSED_PUBLIC_KEY_SIZE);
 }
 
 void CExtPubKey::Decode(const uint8_t code[BIP32_EXTKEY_SIZE]) {
diff -Nru bitcoinabc-0.19.11-uahf/src/pubkey.h bitcoinabc-0.19.12-uahf/src/pubkey.h
--- bitcoinabc-0.19.11-uahf/src/pubkey.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/pubkey.h	2019-08-16 12:22:07.000000000 +0000
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2017 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -15,16 +16,6 @@
 #include <stdexcept>
 #include <vector>
 
-/**
- * secp256k1:
- * const unsigned int PRIVATE_KEY_SIZE = 279;
- * const unsigned int PUBLIC_KEY_SIZE  = 65;
- * const unsigned int SIGNATURE_SIZE   = 72;
- *
- * see www.keylength.com
- * 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 */
@@ -36,22 +27,37 @@
 
 typedef uint256 ChainCode;
 
-/** An encapsulated secp256k1 public key. */
+/** An encapsulated public key. */
 class CPubKey {
+public:
+    /**
+     * secp256k1:
+     */
+    static constexpr unsigned int PUBLIC_KEY_SIZE = 65;
+    static constexpr unsigned int COMPRESSED_PUBLIC_KEY_SIZE = 33;
+    static constexpr unsigned int SIGNATURE_SIZE = 72;
+    static constexpr unsigned int COMPACT_SIGNATURE_SIZE = 65;
+    /**
+     * see www.keylength.com
+     * script supports up to 75 for single byte push
+     */
+    static_assert(PUBLIC_KEY_SIZE >= COMPRESSED_PUBLIC_KEY_SIZE,
+                  "COMPRESSED_PUBLIC_KEY_SIZE is larger than PUBLIC_KEY_SIZE");
+
 private:
     /**
      * Just store the serialized data.
      * Its length can very cheaply be computed from the first byte.
      */
-    uint8_t vch[65];
+    uint8_t vch[PUBLIC_KEY_SIZE];
 
     //! Compute the length of a pubkey with a given first byte.
     static unsigned int GetLen(uint8_t chHeader) {
         if (chHeader == 2 || chHeader == 3) {
-            return 33;
+            return COMPRESSED_PUBLIC_KEY_SIZE;
         }
         if (chHeader == 4 || chHeader == 6 || chHeader == 7) {
-            return 65;
+            return PUBLIC_KEY_SIZE;
         }
         return 0;
     }
@@ -60,6 +66,10 @@
     void Invalidate() { vch[0] = 0xFF; }
 
 public:
+    bool static ValidSize(const std::vector<uint8_t> &vch) {
+        return vch.size() > 0 && GetLen(vch[0]) == vch.size();
+    }
+
     //! Construct an invalid public key.
     CPubKey() { Invalidate(); }
 
@@ -109,7 +119,7 @@
     }
     template <typename Stream> void Unserialize(Stream &s) {
         unsigned int len = ::ReadCompactSize(s);
-        if (len <= 65) {
+        if (len <= PUBLIC_KEY_SIZE) {
             s.read((char *)vch, len);
         } else {
             // invalid pubkey, skip available data
@@ -139,7 +149,7 @@
     bool IsFullyValid() const;
 
     //! Check whether this is a compressed public key.
-    bool IsCompressed() const { return size() == 33; }
+    bool IsCompressed() const { return size() == COMPRESSED_PUBLIC_KEY_SIZE; }
 
     /**
      * Verify a DER-serialized ECDSA signature (~72 bytes).
diff -Nru bitcoinabc-0.19.11-uahf/src/qt/CMakeLists.txt bitcoinabc-0.19.12-uahf/src/qt/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/src/qt/CMakeLists.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/qt/CMakeLists.txt	2019-08-16 12:22:07.000000000 +0000
@@ -145,6 +145,12 @@
 	)
 
 	set_property(TARGET bitcoin-qt-base PROPERTY AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC")
+
+	target_link_libraries(bitcoin-qt-base
+		"-framework Foundation"
+		"-framework ApplicationServices"
+		"-framework AppKit"
+	)
 endif()
 
 # Find out more about Qt. This is similar to
diff -Nru bitcoinabc-0.19.11-uahf/src/qt/coincontroldialog.cpp bitcoinabc-0.19.12-uahf/src/qt/coincontroldialog.cpp
--- bitcoinabc-0.19.11-uahf/src/qt/coincontroldialog.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/qt/coincontroldialog.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -458,7 +458,7 @@
     Amount nPayAmount = Amount::zero();
     bool fDust = false;
     CMutableTransaction txDummy;
-    for (const Amount amount : CoinControlDialog::payAmounts) {
+    for (const Amount &amount : CoinControlDialog::payAmounts) {
         nPayAmount += amount;
 
         if (amount > Amount::zero()) {
diff -Nru bitcoinabc-0.19.11-uahf/src/qt/platformstyle.cpp bitcoinabc-0.19.12-uahf/src/qt/platformstyle.cpp
--- bitcoinabc-0.19.11-uahf/src/qt/platformstyle.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/qt/platformstyle.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -45,7 +45,7 @@
 
 QIcon ColorizeIcon(const QIcon &ico, const QColor &colorbase) {
     QIcon new_ico;
-    for (QSize sz : ico.availableSizes()) {
+    for (const QSize &sz : ico.availableSizes()) {
         QImage img(ico.pixmap(sz).toImage());
         MakeSingleColorImage(img, colorbase);
         new_ico.addPixmap(QPixmap::fromImage(img));
diff -Nru bitcoinabc-0.19.11-uahf/src/qt/recentrequeststablemodel.cpp bitcoinabc-0.19.12-uahf/src/qt/recentrequeststablemodel.cpp
--- bitcoinabc-0.19.11-uahf/src/qt/recentrequeststablemodel.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/qt/recentrequeststablemodel.cpp	2019-08-16 12:22:07.000000000 +0000
@@ -134,12 +134,12 @@
     Q_UNUSED(parent);
 
     if (count > 0 && row >= 0 && (row + count) <= list.size()) {
-        const RecentRequestEntry *rec;
         for (int i = 0; i < count; ++i) {
-            rec = &list[row + i];
+            const RecentRequestEntry *rec = &list[row + i];
             if (!walletModel->saveReceiveRequest(
-                    rec->recipient.address.toStdString(), rec->id, ""))
+                    rec->recipient.address.toStdString(), rec->id, "")) {
                 return false;
+            }
         }
 
         beginRemoveRows(parent, row, row + count - 1);
diff -Nru bitcoinabc-0.19.11-uahf/src/rest.cpp bitcoinabc-0.19.12-uahf/src/rest.cpp
--- bitcoinabc-0.19.11-uahf/src/rest.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/rest.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -546,30 +546,35 @@
     std::vector<bool> hits;
     bitmap.resize((vOutPoints.size() + 7) / 8);
     {
-        LOCK2(cs_main, g_mempool.cs);
-
-        CCoinsView viewDummy;
-        CCoinsViewCache view(&viewDummy);
-
-        CCoinsViewCache &viewChain = *pcoinsTip;
-        CCoinsViewMemPool viewMempool(&viewChain, g_mempool);
+        auto process_utxos = [&vOutPoints, &outs,
+                              &hits](const CCoinsView &view,
+                                     const CTxMemPool &mempool) {
+            for (const COutPoint &vOutPoint : vOutPoints) {
+                Coin coin;
+                bool hit = !mempool.isSpent(vOutPoint) &&
+                           view.GetCoin(vOutPoint, coin);
+                hits.push_back(hit);
+                if (hit) {
+                    outs.emplace_back(std::move(coin));
+                }
+            }
+        };
 
         if (fCheckMemPool) {
-            // switch cache backend to db+mempool in case user likes to query
-            // mempool.
-            view.SetBackend(viewMempool);
+            // use db+mempool as cache backend in case user likes to query
+            // mempool
+            LOCK2(cs_main, g_mempool.cs);
+            CCoinsViewCache &viewChain = *pcoinsTip;
+            CCoinsViewMemPool viewMempool(&viewChain, g_mempool);
+            process_utxos(viewMempool, g_mempool);
+        } else {
+            // no need to lock mempool!
+            LOCK(cs_main);
+            process_utxos(*pcoinsTip, CTxMemPool());
         }
 
-        for (size_t i = 0; i < vOutPoints.size(); i++) {
-            Coin coin;
-            bool hit = false;
-            if (view.GetCoin(vOutPoints[i], coin) &&
-                !g_mempool.isSpent(vOutPoints[i])) {
-                hit = true;
-                outs.emplace_back(std::move(coin));
-            }
-
-            hits.push_back(hit);
+        for (size_t i = 0; i < hits.size(); ++i) {
+            const bool hit = hits[i];
             // form a binary string representation (human-readable for json
             // output)
             bitmapStringRepresentation.append(hit ? "1" : "0");
diff -Nru bitcoinabc-0.19.11-uahf/src/rpc/blockchain.cpp bitcoinabc-0.19.12-uahf/src/rpc/blockchain.cpp
--- bitcoinabc-0.19.11-uahf/src/rpc/blockchain.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/rpc/blockchain.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -14,6 +14,7 @@
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <hash.h>
+#include <index/txindex.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
@@ -27,6 +28,7 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
+#include <boost/algorithm/string.hpp>
 #include <boost/thread/thread.hpp> // boost::thread::interrupt
 
 #include <condition_variable>
@@ -816,6 +818,25 @@
     return blockheaderToJSON(chainActive.Tip(), pblockindex);
 }
 
+static CBlock GetBlockChecked(const Config &config,
+                              const CBlockIndex *pblockindex) {
+    CBlock block;
+    if (fHavePruned && !pblockindex->nStatus.hasData() &&
+        pblockindex->nTx > 0) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)");
+    }
+
+    if (!ReadBlockFromDisk(block, pblockindex, config)) {
+        // Block not found on disk. This could be because we have the block
+        // header in our index but don't have the block (for example if a
+        // non-whitelisted node sends us an unrequested long chain of valid
+        // blocks, we add the headers to our index, but don't accept the block).
+        throw JSONRPCError(RPC_MISC_ERROR, "Block not found on disk");
+    }
+
+    return block;
+}
+
 static UniValue getblock(const Config &config, const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 2) {
@@ -901,19 +922,7 @@
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
     }
 
-    CBlock block;
-    if (fHavePruned && !pblockindex->nStatus.hasData() &&
-        pblockindex->nTx > 0) {
-        throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)");
-    }
-
-    if (!ReadBlockFromDisk(block, pblockindex, config)) {
-        // Block not found on disk. This could be because we have the block
-        // header in our index but don't have the block (for example if a
-        // non-whitelisted node sends us an unrequested long chain of valid
-        // blocks, we add the headers to our index, but don't accept the block).
-        throw JSONRPCError(RPC_MISC_ERROR, "Block not found on disk");
-    }
+    const CBlock block = GetBlockChecked(config, pblockindex);
 
     if (verbosity <= 0) {
         CDataStream ssBlock(SER_NETWORK,
@@ -948,7 +957,7 @@
     ss << VARINT(outputs.begin()->second.GetHeight() * 2 +
                  outputs.begin()->second.IsCoinBase());
     stats.nTransactions++;
-    for (const auto output : outputs) {
+    for (const auto &output : outputs) {
         ss << VARINT(output.first + 1);
         ss << output.second.GetTxOut().scriptPubKey;
         ss << VARINT(output.second.GetTxOut().nValue / SATOSHI);
@@ -1892,6 +1901,324 @@
     return ret;
 }
 
+template <typename T>
+static T CalculateTruncatedMedian(std::vector<T> &scores) {
+    size_t size = scores.size();
+    if (size == 0) {
+        return T();
+    }
+
+    std::sort(scores.begin(), scores.end());
+    if (size % 2 == 0) {
+        return (scores[size / 2 - 1] + scores[size / 2]) / 2;
+    } else {
+        return scores[size / 2];
+    }
+}
+
+template <typename T> static inline bool SetHasKeys(const std::set<T> &set) {
+    return false;
+}
+template <typename T, typename Tk, typename... Args>
+static inline bool SetHasKeys(const std::set<T> &set, const Tk &key,
+                              const Args &... args) {
+    return (set.count(key) != 0) || SetHasKeys(set, args...);
+}
+
+// outpoint (needed for the utxo index) + nHeight + fCoinBase
+static constexpr size_t PER_UTXO_OVERHEAD =
+    sizeof(COutPoint) + sizeof(uint32_t) + sizeof(bool);
+
+static UniValue getblockstats(const Config &config,
+                              const JSONRPCRequest &request) {
+    if (request.fHelp || request.params.size() < 1 ||
+        request.params.size() > 4) {
+        throw std::runtime_error(
+            "getblockstats hash_or_height ( stats )\n"
+            "\nCompute per block statistics for a given window. All amounts "
+            "are in " +
+            CURRENCY_UNIT +
+            ".\n"
+            "It won't work for some heights with pruning.\n"
+            "It won't work without -txindex for utxo_size_inc, *fee or "
+            "*feerate stats.\n"
+            "\nArguments:\n"
+            "1. \"hash_or_height\"     (string or numeric, required) The block "
+            "hash or height of the target block\n"
+            "2. \"stats\"              (array,  optional) Values to plot, by "
+            "default all values (see result below)\n"
+            "    [\n"
+            "      \"height\",         (string, optional) Selected statistic\n"
+            "      \"time\",           (string, optional) Selected statistic\n"
+            "      ,...\n"
+            "    ]\n"
+            "\nResult:\n"
+            "{                           (json object)\n"
+            "  \"avgfee\": x.xxx,          (numeric) Average fee in the block\n"
+            "  \"avgfeerate\": x.xxx,      (numeric) Average feerate (in " +
+            CURRENCY_UNIT +
+            " per byte)\n"
+            "  \"avgtxsize\": xxxxx,       (numeric) Average transaction size\n"
+            "  \"blockhash\": xxxxx,       (string) The block hash (to check "
+            "for potential reorgs)\n"
+            "  \"height\": xxxxx,          (numeric) The height of the block\n"
+            "  \"ins\": xxxxx,             (numeric) The number of inputs "
+            "(excluding coinbase)\n"
+            "  \"maxfee\": xxxxx,          (numeric) Maximum fee in the block\n"
+            "  \"maxfeerate\": xxxxx,      (numeric) Maximum feerate (in " +
+            CURRENCY_UNIT +
+            " per byte)\n"
+            "  \"maxtxsize\": xxxxx,       (numeric) Maximum transaction size\n"
+            "  \"medianfee\": x.xxx,       (numeric) Truncated median fee in "
+            "the block\n"
+            "  \"medianfeerate\": x.xxx,   (numeric) Truncated median feerate "
+            "(in " +
+            CURRENCY_UNIT +
+            " per byte)\n"
+            "  \"mediantime\": xxxxx,      (numeric) The block median time "
+            "past\n"
+            "  \"mediantxsize\": xxxxx,    (numeric) Truncated median "
+            "transaction size\n"
+            "  \"minfee\": x.xxx,          (numeric) Minimum fee in the block\n"
+            "  \"minfeerate\": xx.xx,      (numeric) Minimum feerate (in " +
+            CURRENCY_UNIT +
+            " per byte)\n"
+            "  \"mintxsize\": xxxxx,       (numeric) Minimum transaction size\n"
+            "  \"outs\": xxxxx,            (numeric) The number of outputs\n"
+            "  \"subsidy\": x.xxx,         (numeric) The block subsidy\n"
+            "  \"time\": xxxxx,            (numeric) The block time\n"
+            "  \"total_out\": x.xxx,       (numeric) Total amount in all "
+            "outputs (excluding coinbase and thus reward [ie subsidy + "
+            "totalfee])\n"
+            "  \"total_size\": xxxxx,      (numeric) Total size of all "
+            "non-coinbase transactions\n"
+            "  \"totalfee\": x.xxx,        (numeric) The fee total\n"
+            "  \"txs\": xxxxx,             (numeric) The number of "
+            "transactions (excluding coinbase)\n"
+            "  \"utxo_increase\": xxxxx,   (numeric) The increase/decrease in "
+            "the number of unspent outputs\n"
+            "  \"utxo_size_inc\": xxxxx,   (numeric) The increase/decrease in "
+            "size for the utxo index (not discounting op_return and similar)\n"
+            "}\n"
+            "\nExamples:\n" +
+            HelpExampleCli("getblockstats",
+                           "1000 '[\"minfeerate\",\"avgfeerate\"]'") +
+            HelpExampleRpc("getblockstats",
+                           "1000 '[\"minfeerate\",\"avgfeerate\"]'"));
+    }
+
+    LOCK(cs_main);
+
+    CBlockIndex *pindex;
+    if (request.params[0].isNum()) {
+        const int height = request.params[0].get_int();
+        const int current_tip = chainActive.Height();
+        if (height < 0) {
+            throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                strprintf("Target block height %d is negative", height));
+        }
+        if (height > current_tip) {
+            throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                strprintf("Target block height %d after current tip %d", height,
+                          current_tip));
+        }
+
+        pindex = chainActive[height];
+    } else {
+        const std::string strHash = request.params[0].get_str();
+        const uint256 hash(uint256S(strHash));
+        pindex = LookupBlockIndex(hash);
+        if (!pindex) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
+        }
+        if (!chainActive.Contains(pindex)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER,
+                               strprintf("Block is not in chain %s",
+                                         Params().NetworkIDString()));
+        }
+    }
+
+    assert(pindex != nullptr);
+
+    std::set<std::string> stats;
+    if (!request.params[1].isNull()) {
+        const UniValue stats_univalue = request.params[1].get_array();
+        for (unsigned int i = 0; i < stats_univalue.size(); i++) {
+            const std::string stat = stats_univalue[i].get_str();
+            stats.insert(stat);
+        }
+    }
+
+    const CBlock block = GetBlockChecked(config, pindex);
+
+    // Calculate everything if nothing selected (default)
+    const bool do_all = stats.size() == 0;
+    const bool do_mediantxsize = do_all || stats.count("mediantxsize") != 0;
+    const bool do_medianfee = do_all || stats.count("medianfee") != 0;
+    const bool do_medianfeerate = do_all || stats.count("medianfeerate") != 0;
+    const bool loop_inputs =
+        do_all || do_medianfee || do_medianfeerate ||
+        SetHasKeys(stats, "utxo_size_inc", "totalfee", "avgfee", "avgfeerate",
+                   "minfee", "maxfee", "minfeerate", "maxfeerate");
+    const bool loop_outputs = do_all || loop_inputs || stats.count("total_out");
+    const bool do_calculate_size =
+        do_mediantxsize || loop_inputs ||
+        SetHasKeys(stats, "total_size", "avgtxsize", "mintxsize", "maxtxsize");
+
+    const int64_t blockMaxSize = config.GetMaxBlockSize();
+    Amount maxfee = Amount::zero();
+    Amount maxfeerate = Amount::zero();
+    Amount minfee = MAX_MONEY;
+    Amount minfeerate = MAX_MONEY;
+    Amount total_out = Amount::zero();
+    Amount totalfee = Amount::zero();
+    int64_t inputs = 0;
+    int64_t maxtxsize = 0;
+    int64_t mintxsize = blockMaxSize;
+    int64_t outputs = 0;
+    int64_t total_size = 0;
+    int64_t utxo_size_inc = 0;
+    std::vector<Amount> fee_array;
+    std::vector<Amount> feerate_array;
+    std::vector<int64_t> txsize_array;
+
+    for (const auto &tx : block.vtx) {
+        outputs += tx->vout.size();
+        Amount tx_total_out = Amount::zero();
+        if (loop_outputs) {
+            for (const CTxOut &out : tx->vout) {
+                tx_total_out += out.nValue;
+                utxo_size_inc +=
+                    GetSerializeSize(out, SER_NETWORK, PROTOCOL_VERSION) +
+                    PER_UTXO_OVERHEAD;
+            }
+        }
+
+        if (tx->IsCoinBase()) {
+            continue;
+        }
+
+        // Don't count coinbase's fake input
+        inputs += tx->vin.size();
+        // Don't count coinbase reward
+        total_out += tx_total_out;
+
+        int64_t tx_size = 0;
+        if (do_calculate_size) {
+
+            tx_size = tx->GetTotalSize();
+            if (do_mediantxsize) {
+                txsize_array.push_back(tx_size);
+            }
+            maxtxsize = std::max(maxtxsize, tx_size);
+            mintxsize = std::min(mintxsize, tx_size);
+            total_size += tx_size;
+        }
+
+        if (loop_inputs) {
+
+            if (!g_txindex) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   "One or more of the selected stats requires "
+                                   "-txindex enabled");
+            }
+            Amount tx_total_in = Amount::zero();
+            for (const CTxIn &in : tx->vin) {
+                CTransactionRef tx_in;
+                uint256 hashBlock;
+                if (!GetTransaction(config, in.prevout.GetTxId(), tx_in,
+                                    hashBlock, false)) {
+                    throw JSONRPCError(RPC_INTERNAL_ERROR,
+                                       std::string("Unexpected internal error "
+                                                   "(tx index seems corrupt)"));
+                }
+
+                CTxOut prevoutput = tx_in->vout[in.prevout.GetN()];
+
+                tx_total_in += prevoutput.nValue;
+                utxo_size_inc -= GetSerializeSize(prevoutput, SER_NETWORK,
+                                                  PROTOCOL_VERSION) +
+                                 PER_UTXO_OVERHEAD;
+            }
+
+            Amount txfee = tx_total_in - tx_total_out;
+            assert(MoneyRange(txfee));
+            if (do_medianfee) {
+                fee_array.push_back(txfee);
+            }
+            maxfee = std::max(maxfee, txfee);
+            minfee = std::min(minfee, txfee);
+            totalfee += txfee;
+
+            Amount feerate = txfee / tx_size;
+            if (do_medianfeerate) {
+                feerate_array.push_back(feerate);
+            }
+            maxfeerate = std::max(maxfeerate, feerate);
+            minfeerate = std::min(minfeerate, feerate);
+        }
+    }
+
+    UniValue ret_all(UniValue::VOBJ);
+    ret_all.pushKV("avgfee",
+                   ValueFromAmount((block.vtx.size() > 1)
+                                       ? totalfee / int((block.vtx.size() - 1))
+                                       : Amount::zero()));
+    ret_all.pushKV("avgfeerate",
+                   ValueFromAmount((total_size > 0) ? totalfee / total_size
+                                                    : Amount::zero()));
+    ret_all.pushKV("avgtxsize", (block.vtx.size() > 1)
+                                    ? total_size / (block.vtx.size() - 1)
+                                    : 0);
+    ret_all.pushKV("blockhash", pindex->GetBlockHash().GetHex());
+    ret_all.pushKV("height", (int64_t)pindex->nHeight);
+    ret_all.pushKV("ins", inputs);
+    ret_all.pushKV("maxfee", ValueFromAmount(maxfee));
+    ret_all.pushKV("maxfeerate", ValueFromAmount(maxfeerate));
+    ret_all.pushKV("maxtxsize", maxtxsize);
+    ret_all.pushKV("medianfee",
+                   ValueFromAmount(CalculateTruncatedMedian(fee_array)));
+    ret_all.pushKV("medianfeerate",
+                   ValueFromAmount(CalculateTruncatedMedian(feerate_array)));
+    ret_all.pushKV("mediantime", pindex->GetMedianTimePast());
+    ret_all.pushKV("mediantxsize", CalculateTruncatedMedian(txsize_array));
+    ret_all.pushKV(
+        "minfee",
+        ValueFromAmount((minfee == MAX_MONEY) ? Amount::zero() : minfee));
+    ret_all.pushKV("minfeerate",
+                   ValueFromAmount((minfeerate == MAX_MONEY) ? Amount::zero()
+                                                             : minfeerate));
+    ret_all.pushKV("mintxsize", mintxsize == blockMaxSize ? 0 : mintxsize);
+    ret_all.pushKV("outs", outputs);
+    ret_all.pushKV("subsidy", ValueFromAmount(GetBlockSubsidy(
+                                  pindex->nHeight, Params().GetConsensus())));
+    ret_all.pushKV("time", pindex->GetBlockTime());
+    ret_all.pushKV("total_out", ValueFromAmount(total_out));
+    ret_all.pushKV("total_size", total_size);
+    ret_all.pushKV("totalfee", ValueFromAmount(totalfee));
+    ret_all.pushKV("txs", (int64_t)block.vtx.size());
+    ret_all.pushKV("utxo_increase", outputs - inputs);
+    ret_all.pushKV("utxo_size_inc", utxo_size_inc);
+
+    if (do_all) {
+        return ret_all;
+    }
+
+    UniValue ret(UniValue::VOBJ);
+    for (const std::string &stat : stats) {
+        const UniValue &value = ret_all[stat];
+        if (value.isNull()) {
+            throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                strprintf("Invalid selected statistic %s", stat));
+        }
+        ret.pushKV(stat, value);
+    }
+    return ret;
+}
+
 static UniValue savemempool(const Config &config,
                             const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() != 0) {
@@ -1918,14 +2245,15 @@
 static const ContextFreeRPCCommand commands[] = {
     //  category            name                      actor (function)        argNames
     //  ------------------- ------------------------  ----------------------  ----------
-    { "blockchain",         "getblockchaininfo",      getblockchaininfo,      {} },
-    { "blockchain",         "getchaintxstats",        &getchaintxstats,       {"nblocks", "blockhash"} },
     { "blockchain",         "getbestblockhash",       getbestblockhash,       {} },
-    { "blockchain",         "getblockcount",          getblockcount,          {} },
     { "blockchain",         "getblock",               getblock,               {"blockhash","verbosity|verbose"} },
+    { "blockchain",         "getblockchaininfo",      getblockchaininfo,      {} },
+    { "blockchain",         "getblockcount",          getblockcount,          {} },
     { "blockchain",         "getblockhash",           getblockhash,           {"height"} },
     { "blockchain",         "getblockheader",         getblockheader,         {"blockhash","verbose"} },
+    { "blockchain",         "getblockstats",          getblockstats,          {"hash_or_height","stats"} },
     { "blockchain",         "getchaintips",           getchaintips,           {} },
+    { "blockchain",         "getchaintxstats",        getchaintxstats,        {"nblocks", "blockhash"} },
     { "blockchain",         "getdifficulty",          getdifficulty,          {} },
     { "blockchain",         "getmempoolancestors",    getmempoolancestors,    {"txid","verbose"} },
     { "blockchain",         "getmempooldescendants",  getmempooldescendants,  {"txid","verbose"} },
diff -Nru bitcoinabc-0.19.11-uahf/src/rpc/client.cpp bitcoinabc-0.19.12-uahf/src/rpc/client.cpp
--- bitcoinabc-0.19.11-uahf/src/rpc/client.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/rpc/client.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -114,6 +114,8 @@
     {"importmulti", 1, "options"},
     {"verifychain", 0, "checklevel"},
     {"verifychain", 1, "nblocks"},
+    {"getblockstats", 0, "hash_or_height"},
+    {"getblockstats", 1, "stats"},
     {"pruneblockchain", 0, "height"},
     {"keypoolrefill", 0, "newsize"},
     {"getrawmempool", 0, "verbose"},
diff -Nru bitcoinabc-0.19.11-uahf/src/rpc/net.cpp bitcoinabc-0.19.12-uahf/src/rpc/net.cpp
--- bitcoinabc-0.19.11-uahf/src/rpc/net.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/rpc/net.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -110,7 +110,7 @@
             "    \"pingwait\": n,             (numeric) ping wait (if "
             "non-zero)\n"
             "    \"version\": v,              (numeric) The peer version, such "
-            "as 7001\n"
+            "as 70001\n"
             "    \"subver\": \"/Satoshi:0.8.5/\",  (string) The string "
             "version\n"
             "    \"inbound\": true|false,     (boolean) Inbound (true) or "
@@ -596,7 +596,8 @@
     UniValue localAddresses(UniValue::VARR);
     {
         LOCK(cs_mapLocalHost);
-        for (const std::pair<CNetAddr, LocalServiceInfo> &item : mapLocalHost) {
+        for (const std::pair<const CNetAddr, LocalServiceInfo> &item :
+             mapLocalHost) {
             UniValue rec(UniValue::VOBJ);
             rec.pushKV("address", item.first.ToString());
             rec.pushKV("port", item.second.nPort);
diff -Nru bitcoinabc-0.19.11-uahf/src/rpc/rawtransaction.cpp bitcoinabc-0.19.12-uahf/src/rpc/rawtransaction.cpp
--- bitcoinabc-0.19.11-uahf/src/rpc/rawtransaction.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/rpc/rawtransaction.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -918,9 +918,6 @@
             if (is_temp_keystore && scriptPubKey.IsPayToScriptHash()) {
                 RPCTypeCheckObj(
                     prevOut, {
-                                 {"txid", UniValueType(UniValue::VSTR)},
-                                 {"vout", UniValueType(UniValue::VNUM)},
-                                 {"scriptPubKey", UniValueType(UniValue::VSTR)},
                                  {"redeemScript", UniValueType(UniValue::VSTR)},
                              });
                 UniValue v = find_value(prevOut, "redeemScript");
diff -Nru bitcoinabc-0.19.11-uahf/src/script/interpreter.cpp bitcoinabc-0.19.12-uahf/src/script/interpreter.cpp
--- bitcoinabc-0.19.11-uahf/src/script/interpreter.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/interpreter.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -11,10 +11,12 @@
 #include <crypto/sha256.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
+#include <script/bitfield.h>
 #include <script/script.h>
 #include <script/script_flags.h>
 #include <script/sigencoding.h>
 #include <uint256.h>
+#include <util/bitmanip.h>
 
 bool CastToBool(const valtype &vch) {
     for (size_t i = 0; i < vch.size(); i++) {
@@ -53,29 +55,31 @@
 }
 
 static bool CheckMinimalPush(const valtype &data, opcodetype opcode) {
+    // Excludes OP_1NEGATE, OP_1-16 since they are by definition minimal
+    assert(0 <= opcode && opcode <= OP_PUSHDATA4);
     if (data.size() == 0) {
-        // Could have used OP_0.
+        // Should have used OP_0.
         return opcode == OP_0;
     }
     if (data.size() == 1 && data[0] >= 1 && data[0] <= 16) {
-        // Could have used OP_1 .. OP_16.
-        return opcode == OP_1 + (data[0] - 1);
+        // Should have used OP_1 .. OP_16.
+        return false;
     }
     if (data.size() == 1 && data[0] == 0x81) {
-        // Could have used OP_1NEGATE.
-        return opcode == OP_1NEGATE;
+        // Should have used OP_1NEGATE.
+        return false;
     }
     if (data.size() <= 75) {
-        // Could have used a direct push (opcode indicating number of bytes
+        // Must have used a direct push (opcode indicating number of bytes
         // pushed + those bytes).
         return opcode == data.size();
     }
     if (data.size() <= 255) {
-        // Could have used OP_PUSHDATA.
+        // Must have used OP_PUSHDATA.
         return opcode == OP_PUSHDATA1;
     }
     if (data.size() <= 65535) {
-        // Could have used OP_PUSHDATA2.
+        // Must have used OP_PUSHDATA2.
         return opcode == OP_PUSHDATA2;
     }
     return true;
@@ -1010,63 +1014,158 @@
                                 serror, ScriptError::INVALID_STACK_OPERATION);
                         }
 
-                        // A bug causes CHECKMULTISIG to consume one extra
-                        // argument whose contents were not checked in any way.
-                        //
-                        // Unfortunately this is a potential source of
-                        // mutability, so optionally verify it is exactly equal
-                        // to zero.
-                        if ((flags & SCRIPT_VERIFY_NULLDUMMY) &&
-                            stacktop(-idxDummy).size()) {
-                            return set_error(serror,
-                                             ScriptError::SIG_NULLDUMMY);
-                        }
-
                         // Subset of script starting at the most recent
                         // codeseparator
                         CScript scriptCode(pbegincodehash, pend);
 
-                        // Remove signature for pre-fork scripts
-                        for (int k = 0; k < nSigsCount; k++) {
-                            valtype &vchSig = stacktop(-idxTopSig - k);
-                            CleanupScriptCode(scriptCode, vchSig, flags);
-                        }
-
+                        // Assuming success is usually a bad idea, but the
+                        // schnorr path can only succeed.
                         bool fSuccess = true;
-                        int nSigsRemaining = nSigsCount;
-                        int nKeysRemaining = nKeysCount;
-                        while (fSuccess && nSigsRemaining > 0) {
-                            valtype &vchSig = stacktop(
-                                -idxTopSig - (nSigsCount - nSigsRemaining));
-                            valtype &vchPubKey = stacktop(
-                                -idxTopKey - (nKeysCount - nKeysRemaining));
-
-                            // 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 (!CheckTransactionECDSASignatureEncoding(
-                                    vchSig, flags, serror) ||
-                                !CheckPubKeyEncoding(vchPubKey, flags,
-                                                     serror)) {
+
+                        if ((flags & SCRIPT_ENABLE_SCHNORR_MULTISIG) &&
+                            stacktop(-idxDummy).size() != 0) {
+                            // SCHNORR MULTISIG
+                            static_assert(
+                                MAX_PUBKEYS_PER_MULTISIG < 32,
+                                "Schnorr multisig checkbits implementation "
+                                "assumes < 32 pubkeys.");
+                            uint32_t checkBits = 0;
+
+                            // Dummy element is to be interpreted as a bitfield
+                            // that represent which pubkeys should be checked.
+                            valtype &vchDummy = stacktop(-idxDummy);
+                            if (!DecodeBitfield(vchDummy, nKeysCount, checkBits,
+                                                serror)) {
                                 // serror is set
                                 return false;
                             }
 
-                            // Check signature
-                            bool fOk = checker.CheckSig(vchSig, vchPubKey,
-                                                        scriptCode, flags);
+                            // The bitfield doesn't set the right number of
+                            // signatures.
+                            if (countBits(checkBits) != uint32_t(nSigsCount)) {
+                                return set_error(
+                                    serror, ScriptError::INVALID_BIT_COUNT);
+                            }
+
+                            const size_t idxBottomKey =
+                                idxTopKey + nKeysCount - 1;
+                            const size_t idxBottomSig =
+                                idxTopSig + nSigsCount - 1;
+
+                            int iKey = 0;
+                            for (int iSig = 0; iSig < nSigsCount;
+                                 iSig++, iKey++) {
+                                if ((checkBits >> iKey) == 0) {
+                                    // This is a sanity check and should be
+                                    // unrecheable.
+                                    return set_error(
+                                        serror, ScriptError::INVALID_BIT_RANGE);
+                                }
+
+                                // Find the next suitable key.
+                                while (((checkBits >> iKey) & 0x01) == 0) {
+                                    iKey++;
+                                }
 
-                            if (fOk) {
-                                nSigsRemaining--;
+                                if (iKey >= nKeysCount) {
+                                    // This is a sanity check and should be
+                                    // unrecheable.
+                                    return set_error(serror,
+                                                     ScriptError::PUBKEY_COUNT);
+                                }
+
+                                // Check the signature.
+                                valtype &vchSig =
+                                    stacktop(-idxBottomSig + iSig);
+                                valtype &vchPubKey =
+                                    stacktop(-idxBottomKey + iKey);
+
+                                // Note that only pubkeys associated with a
+                                // signature are checked for validity.
+                                if (!CheckTransactionSchnorrSignatureEncoding(
+                                        vchSig, flags, serror) ||
+                                    !CheckPubKeyEncoding(vchPubKey, flags,
+                                                         serror)) {
+                                    // serror is set
+                                    return false;
+                                }
+
+                                // Check signature
+                                if (!checker.CheckSig(vchSig, vchPubKey,
+                                                      scriptCode, flags)) {
+                                    // This can fail if the signature is empty,
+                                    // which also is a NULLFAIL error as the
+                                    // bitfield should have been null in this
+                                    // situation.
+                                    return set_error(serror,
+                                                     ScriptError::SIG_NULLFAIL);
+                                }
+                            }
+
+                            if ((checkBits >> iKey) != 0) {
+                                // This is a sanity check and should be
+                                // unrecheable.
+                                return set_error(
+                                    serror, ScriptError::INVALID_BIT_COUNT);
+                            }
+                        } else {
+                            // LEGACY MULTISIG (ECDSA / NULL)
+                            // A bug causes CHECKMULTISIG to consume one extra
+                            // argument whose contents were not checked in any
+                            // way.
+                            //
+                            // Unfortunately this is a potential source of
+                            // mutability, so optionally verify it is exactly
+                            // equal to zero.
+                            if ((flags & SCRIPT_VERIFY_NULLDUMMY) &&
+                                stacktop(-idxDummy).size()) {
+                                return set_error(serror,
+                                                 ScriptError::SIG_NULLDUMMY);
                             }
-                            nKeysRemaining--;
 
-                            // If there are more signatures left than keys left,
-                            // then too many signatures have failed. Exit early,
-                            // without checking any further signatures.
-                            if (nSigsRemaining > nKeysRemaining) {
-                                fSuccess = false;
+                            // Remove signature for pre-fork scripts
+                            for (int k = 0; k < nSigsCount; k++) {
+                                valtype &vchSig = stacktop(-idxTopSig - k);
+                                CleanupScriptCode(scriptCode, vchSig, flags);
+                            }
+
+                            int nSigsRemaining = nSigsCount;
+                            int nKeysRemaining = nKeysCount;
+                            while (fSuccess && nSigsRemaining > 0) {
+                                valtype &vchSig = stacktop(
+                                    -idxTopSig - (nSigsCount - nSigsRemaining));
+                                valtype &vchPubKey = stacktop(
+                                    -idxTopKey - (nKeysCount - nKeysRemaining));
+
+                                // 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 (!CheckTransactionECDSASignatureEncoding(
+                                        vchSig, flags, serror) ||
+                                    !CheckPubKeyEncoding(vchPubKey, flags,
+                                                         serror)) {
+                                    // serror is set
+                                    return false;
+                                }
+
+                                // Check signature
+                                bool fOk = checker.CheckSig(vchSig, vchPubKey,
+                                                            scriptCode, flags);
+
+                                if (fOk) {
+                                    nSigsRemaining--;
+                                }
+                                nKeysRemaining--;
+
+                                // If there are more signatures left than keys
+                                // left, then too many signatures have failed.
+                                // Exit early, without checking any further
+                                // signatures.
+                                if (nSigsRemaining > nKeysRemaining) {
+                                    fSuccess = false;
+                                }
                             }
                         }
 
diff -Nru bitcoinabc-0.19.11-uahf/src/script/script.cpp bitcoinabc-0.19.12-uahf/src/script/script.cpp
--- bitcoinabc-0.19.11-uahf/src/script/script.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/script.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -258,12 +258,6 @@
         case OP_INVALIDOPCODE:
             return "OP_INVALIDOPCODE";
 
-            // Note:
-            //  The template matching params OP_SMALLINTEGER/etc are defined in
-            //  opcodetype enum as kind of implementation hack, they are *NOT*
-            //  real opcodes. If found in real Script, just let the default:
-            //  case deal with them.
-
         default:
             return "OP_UNKNOWN";
     }
diff -Nru bitcoinabc-0.19.11-uahf/src/script/script_error.cpp bitcoinabc-0.19.12-uahf/src/script/script_error.cpp
--- bitcoinabc-0.19.11-uahf/src/script/script_error.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/script_error.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -45,6 +45,8 @@
             return "The requested encoding is impossible to satisfy";
         case ScriptError::INVALID_SPLIT_RANGE:
             return "Invalid OP_SPLIT range";
+        case ScriptError::INVALID_BIT_COUNT:
+            return "Invalid number of bit set in OP_CHECKMULTISIG";
         case ScriptError::BAD_OPCODE:
             return "Opcode missing or not understood";
         case ScriptError::DISABLED_OPCODE:
diff -Nru bitcoinabc-0.19.11-uahf/src/script/script_error.h bitcoinabc-0.19.12-uahf/src/script/script_error.h
--- bitcoinabc-0.19.11-uahf/src/script/script_error.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/script_error.h	2019-08-16 12:22:08.000000000 +0000
@@ -25,6 +25,7 @@
     INVALID_NUMBER_RANGE,
     IMPOSSIBLE_ENCODING,
     INVALID_SPLIT_RANGE,
+    INVALID_BIT_COUNT,
 
     /* Failed verify operations */
     VERIFY,
diff -Nru bitcoinabc-0.19.11-uahf/src/script/script.h bitcoinabc-0.19.12-uahf/src/script/script.h
--- bitcoinabc-0.19.11-uahf/src/script/script.h	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/script.h	2019-08-16 12:22:08.000000000 +0000
@@ -189,12 +189,6 @@
     OP_PREFIX_BEGIN = 0xf0,
     OP_PREFIX_END = 0xf7,
 
-    // template matching params
-    OP_SMALLINTEGER = 0xfa,
-    OP_PUBKEYS = 0xfb,
-    OP_PUBKEYHASH = 0xfd,
-    OP_PUBKEY = 0xfe,
-
     OP_INVALIDOPCODE = 0xff,
 };
 
diff -Nru bitcoinabc-0.19.11-uahf/src/script/sigencoding.cpp bitcoinabc-0.19.12-uahf/src/script/sigencoding.cpp
--- bitcoinabc-0.19.11-uahf/src/script/sigencoding.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/sigencoding.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -164,12 +164,15 @@
         // In an ECDSA-only context, 64-byte signatures are forbidden.
         return set_error(serror, ScriptError::SIG_BADLENGTH);
     }
+    // https://bitcoin.stackexchange.com/a/12556:
     if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S |
                   SCRIPT_VERIFY_STRICTENC)) &&
         !IsValidDERSignatureEncoding(sig)) {
         return set_error(serror, ScriptError::SIG_DER);
     }
-
+    // If the S value is above the order of the curve divided by two, its
+    // complement modulo the order could have been used instead, which is
+    // one byte shorter when encoded correctly.
     if ((flags & SCRIPT_VERIFY_LOW_S) && !CPubKey::CheckLowS(sig)) {
         return set_error(serror, ScriptError::SIG_HIGH_S);
     }
@@ -285,11 +288,11 @@
 
 static bool IsCompressedOrUncompressedPubKey(const valtype &vchPubKey) {
     switch (vchPubKey.size()) {
-        case 33:
+        case CPubKey::COMPRESSED_PUBLIC_KEY_SIZE:
             // Compressed public key: must start with 0x02 or 0x03.
             return vchPubKey[0] == 0x02 || vchPubKey[0] == 0x03;
 
-        case 65:
+        case CPubKey::PUBLIC_KEY_SIZE:
             // Non-compressed public key: must start with 0x04.
             return vchPubKey[0] == 0x04;
 
@@ -300,7 +303,7 @@
 }
 
 static bool IsCompressedPubKey(const valtype &vchPubKey) {
-    if (vchPubKey.size() != 33) {
+    if (vchPubKey.size() != CPubKey::COMPRESSED_PUBLIC_KEY_SIZE) {
         // Non-canonical public key: invalid length for compressed key
         return false;
     }
diff -Nru bitcoinabc-0.19.11-uahf/src/script/sign.cpp bitcoinabc-0.19.12-uahf/src/script/sign.cpp
--- bitcoinabc-0.19.11-uahf/src/script/sign.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/sign.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -141,18 +141,17 @@
 
 bool ProduceSignature(const BaseSignatureCreator &creator,
                       const CScript &fromPubKey, SignatureData &sigdata) {
-    CScript script = fromPubKey;
     std::vector<valtype> result;
     txnouttype whichType;
-    bool solved = SignStep(creator, script, result, whichType);
+    bool solved = SignStep(creator, fromPubKey, result, whichType);
     CScript subscript;
 
     if (solved && whichType == TX_SCRIPTHASH) {
         // Solver returns the subscript that needs to be evaluated; the final
         // scriptSig is the signatures from that and then the serialized
         // subscript:
-        script = subscript = CScript(result[0].begin(), result[0].end());
-        solved = solved && SignStep(creator, script, result, whichType) &&
+        subscript = CScript(result[0].begin(), result[0].end());
+        solved = solved && SignStep(creator, subscript, result, whichType) &&
                  whichType != TX_SCRIPTHASH;
         result.push_back(
             std::vector<uint8_t>(subscript.begin(), subscript.end()));
diff -Nru bitcoinabc-0.19.11-uahf/src/script/standard.cpp bitcoinabc-0.19.12-uahf/src/script/standard.cpp
--- bitcoinabc-0.19.11-uahf/src/script/standard.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/script/standard.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -35,27 +35,67 @@
     return nullptr;
 }
 
-bool Solver(const CScript &scriptPubKey, txnouttype &typeRet,
-            std::vector<std::vector<uint8_t>> &vSolutionsRet) {
-    // Templates
-    static std::multimap<txnouttype, CScript> mTemplates;
-    if (mTemplates.empty()) {
-        // Standard tx, sender provides pubkey, receiver adds signature
-        mTemplates.insert(
-            std::make_pair(TX_PUBKEY, CScript() << OP_PUBKEY << OP_CHECKSIG));
-
-        // Bitcoin address tx, sender provides hash of pubkey, receiver provides
-        // signature and pubkey
-        mTemplates.insert(std::make_pair(
-            TX_PUBKEYHASH, CScript() << OP_DUP << OP_HASH160 << OP_PUBKEYHASH
-                                     << OP_EQUALVERIFY << OP_CHECKSIG));
-
-        // Sender provides N pubkeys, receivers provides M signatures
-        mTemplates.insert(std::make_pair(
-            TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS
-                                   << OP_SMALLINTEGER << OP_CHECKMULTISIG));
+static bool MatchPayToPubkey(const CScript &script, valtype &pubkey) {
+    if (script.size() == CPubKey::PUBLIC_KEY_SIZE + 2 &&
+        script[0] == CPubKey::PUBLIC_KEY_SIZE && script.back() == OP_CHECKSIG) {
+        pubkey = valtype(script.begin() + 1,
+                         script.begin() + CPubKey::PUBLIC_KEY_SIZE + 1);
+        return CPubKey::ValidSize(pubkey);
+    }
+    if (script.size() == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE + 2 &&
+        script[0] == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE &&
+        script.back() == OP_CHECKSIG) {
+        pubkey =
+            valtype(script.begin() + 1,
+                    script.begin() + CPubKey::COMPRESSED_PUBLIC_KEY_SIZE + 1);
+        return CPubKey::ValidSize(pubkey);
+    }
+    return false;
+}
+
+static bool MatchPayToPubkeyHash(const CScript &script, valtype &pubkeyhash) {
+    if (script.size() == 25 && script[0] == OP_DUP && script[1] == OP_HASH160 &&
+        script[2] == 20 && script[23] == OP_EQUALVERIFY &&
+        script[24] == OP_CHECKSIG) {
+        pubkeyhash = valtype(script.begin() + 3, script.begin() + 23);
+        return true;
     }
+    return false;
+}
+
+/** Test for "small positive integer" script opcodes - OP_1 through OP_16. */
+static constexpr bool IsSmallInteger(opcodetype opcode) {
+    return opcode >= OP_1 && opcode <= OP_16;
+}
 
+static bool MatchMultisig(const CScript &script, unsigned int &required,
+                          std::vector<valtype> &pubkeys) {
+    opcodetype opcode;
+    valtype data;
+    CScript::const_iterator it = script.begin();
+    if (script.size() < 1 || script.back() != OP_CHECKMULTISIG) {
+        return false;
+    }
+
+    if (!script.GetOp(it, opcode, data) || !IsSmallInteger(opcode)) {
+        return false;
+    }
+    required = CScript::DecodeOP_N(opcode);
+    while (script.GetOp(it, opcode, data) && CPubKey::ValidSize(data)) {
+        pubkeys.emplace_back(std::move(data));
+    }
+    if (!IsSmallInteger(opcode)) {
+        return false;
+    }
+    unsigned int keys = CScript::DecodeOP_N(opcode);
+    if (pubkeys.size() != keys || keys < required) {
+        return false;
+    }
+    return (it + 1 == script.end());
+}
+
+bool Solver(const CScript &scriptPubKey, txnouttype &typeRet,
+            std::vector<std::vector<uint8_t>> &vSolutionsRet) {
     vSolutionsRet.clear();
 
     // Shortcut for pay-to-script-hash, which are more constrained than the
@@ -80,78 +120,29 @@
         return true;
     }
 
-    // Scan templates
-    const CScript &script1 = scriptPubKey;
-    for (const std::pair<txnouttype, CScript> &tplate : mTemplates) {
-        const CScript &script2 = tplate.second;
-        vSolutionsRet.clear();
-
-        opcodetype opcode1, opcode2;
-        std::vector<uint8_t> vch1, vch2;
-
-        // Compare
-        CScript::const_iterator pc1 = script1.begin();
-        CScript::const_iterator pc2 = script2.begin();
-        while (true) {
-            if (pc1 == script1.end() && pc2 == script2.end()) {
-                // Found a match
-                typeRet = tplate.first;
-                if (typeRet == TX_MULTISIG) {
-                    // Additional checks for TX_MULTISIG:
-                    uint8_t m = vSolutionsRet.front()[0];
-                    uint8_t n = vSolutionsRet.back()[0];
-                    if (m < 1 || n < 1 || m > n ||
-                        vSolutionsRet.size() - 2 != n) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            if (!script1.GetOp(pc1, opcode1, vch1)) {
-                break;
-            }
-            if (!script2.GetOp(pc2, opcode2, vch2)) {
-                break;
-            }
-
-            // Template matching opcodes:
-            if (opcode2 == OP_PUBKEYS) {
-                while (vch1.size() >= 33 && vch1.size() <= 65) {
-                    vSolutionsRet.push_back(vch1);
-                    if (!script1.GetOp(pc1, opcode1, vch1)) {
-                        break;
-                    }
-                }
-                if (!script2.GetOp(pc2, opcode2, vch2)) {
-                    break;
-                }
-                // Normal situation is to fall through to other if/else
-                // statements
-            }
-
-            if (opcode2 == OP_PUBKEY) {
-                if (vch1.size() < 33 || vch1.size() > 65) {
-                    break;
-                }
-                vSolutionsRet.push_back(vch1);
-            } else if (opcode2 == OP_PUBKEYHASH) {
-                if (vch1.size() != sizeof(uint160)) {
-                    break;
-                }
-                vSolutionsRet.push_back(vch1);
-            } else if (opcode2 == OP_SMALLINTEGER) {
-                // Single-byte small integer pushed onto vSolutions
-                if (opcode1 == OP_0 || (opcode1 >= OP_1 && opcode1 <= OP_16)) {
-                    char n = (char)CScript::DecodeOP_N(opcode1);
-                    vSolutionsRet.push_back(valtype(1, n));
-                } else {
-                    break;
-                }
-            } else if (opcode1 != opcode2 || vch1 != vch2) {
-                // Others must match exactly
-                break;
-            }
-        }
+    std::vector<uint8_t> data;
+    if (MatchPayToPubkey(scriptPubKey, data)) {
+        typeRet = TX_PUBKEY;
+        vSolutionsRet.push_back(std::move(data));
+        return true;
+    }
+
+    if (MatchPayToPubkeyHash(scriptPubKey, data)) {
+        typeRet = TX_PUBKEYHASH;
+        vSolutionsRet.push_back(std::move(data));
+        return true;
+    }
+
+    unsigned int required;
+    std::vector<std::vector<uint8_t>> keys;
+    if (MatchMultisig(scriptPubKey, required, keys)) {
+        typeRet = TX_MULTISIG;
+        // safe as required is in range 1..16
+        vSolutionsRet.push_back({static_cast<uint8_t>(required)});
+        vSolutionsRet.insert(vSolutionsRet.end(), keys.begin(), keys.end());
+        // safe as size is in range 1..16
+        vSolutionsRet.push_back({static_cast<uint8_t>(keys.size())});
+        return true;
     }
 
     vSolutionsRet.clear();
diff -Nru bitcoinabc-0.19.11-uahf/src/secp256k1/CMakeLists.txt bitcoinabc-0.19.12-uahf/src/secp256k1/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/src/secp256k1/CMakeLists.txt	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/secp256k1/CMakeLists.txt	2019-08-16 12:22:08.000000000 +0000
@@ -4,15 +4,13 @@
 project(secp256k1)
 
 # libsecp256k1 use a different set of flags.
-add_compiler_flag(
+add_compiler_flags(
 	-pedantic
-	-Wshadow
 	-Wno-unused-function
-	-Wno-nonnull
 	-Wno-overlength-strings
 )
 
-add_c_compiler_flag(
+add_c_compiler_flags(
 	-std=c89
 	-Wno-long-long
 )
diff -Nru bitcoinabc-0.19.11-uahf/src/seeder/bitcoin.cpp bitcoinabc-0.19.12-uahf/src/seeder/bitcoin.cpp
--- bitcoinabc-0.19.11-uahf/src/seeder/bitcoin.cpp	2019-08-01 08:42:42.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/seeder/bitcoin.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -279,7 +279,8 @@
                     return false;
                 }
                 // no proxy needed (none set for target network)
-                connected = ConnectSocketDirectly(you, sock, nConnectTimeout);
+                connected =
+                    ConnectSocketDirectly(you, sock, nConnectTimeout, true);
             }
         }
 
diff -Nru bitcoinabc-0.19.11-uahf/src/serialize.h bitcoinabc-0.19.12-uahf/src/serialize.h
--- bitcoinabc-0.19.11-uahf/src/serialize.h	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/serialize.h	2019-08-16 12:22:08.000000000 +0000
@@ -179,9 +179,12 @@
         SerializationOp(s, CSerActionUnserialize());                           \
     }
 
+#ifndef CHAR_EQUALS_INT8
+// TODO Get rid of bare char
 template <typename Stream> inline void Serialize(Stream &s, char a) {
     ser_writedata8(s, a);
-} // TODO Get rid of bare char
+}
+#endif
 template <typename Stream> inline void Serialize(Stream &s, int8_t a) {
     ser_writedata8(s, a);
 }
@@ -212,10 +215,12 @@
 template <typename Stream> inline void Serialize(Stream &s, double a) {
     ser_writedata64(s, ser_double_to_uint64(a));
 }
+#ifndef CHAR_EQUALS_INT8
 // TODO Get rid of bare char
 template <typename Stream> inline void Unserialize(Stream &s, char &a) {
     a = ser_readdata8(s);
 }
+#endif
 template <typename Stream> inline void Unserialize(Stream &s, int8_t &a) {
     a = ser_readdata8(s);
 }
diff -Nru bitcoinabc-0.19.11-uahf/src/test/data/script_tests.json bitcoinabc-0.19.12-uahf/src/test/data/script_tests.json
--- bitcoinabc-0.19.11-uahf/src/test/data/script_tests.json	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/data/script_tests.json	2019-08-16 12:22:08.000000000 +0000
@@ -3078,6 +3078,279 @@
     "SIG_BADLENGTH",
     "recovered-pubkey CHECKMULTISIG with 64-byte DER w/ SCHNORR_MULTISIG"
 ],
+[
+    "0 0 0",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 w/ SCHNORR_MULTISIG (return-false still valid via legacy mode)"
+],
+[
+    "0",
+    "0 0 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 0-of-0 w/ SCHNORR_MULTISIG"
+],
+[
+    "0",
+    "0 0x02 0xbeef 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 0-of-1 w/ SCHNORR_MULTISIG, null dummy"
+],
+[
+    "1 0x41 0x105e4fed395e64ca013ac1ce020ef69b9990a577fe4b74648faafb69e499f76dd53d5c64aa866924361dd3aadde9b7184bbcb4f79520396c9ed17c4d8489a59701",
+    "1 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 1-of-1 Schnorr"
+],
+[
+    "0x02 0x0100 0x41 0x105e4fed395e64ca013ac1ce020ef69b9990a577fe4b74648faafb69e499f76dd53d5c64aa866924361dd3aadde9b7184bbcb4f79520396c9ed17c4d8489a59701",
+    "1 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BITFIELD_SIZE",
+    "CHECKMULTISIG 1-of-1 Schnorr, nonminimal bits"
+],
+[
+    "7 0x41 0x833682d4f60cc916a22a2c263e658fa662c49badb1e2a8c6208987bf99b1abd740498371480069e7a7a6e7471bf78c27bd9a1fd04fb212a92017346250ac187b01 0x41 0xea4a8d20562a950f4695dc24804565482e9fa111704886179d0c348f2b8a15fe691a305cd599c59c131677146661d5b98cb935330989a85f33afc70d0a21add101 0x41 0xce9011d76a4df05d6280b2382b4d91490dbec7c3e72dc826be1fc9b4718f627955190745cac96521ea46d6d324c7376461e225310e6cd605b9f266d170769b7901",
+    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 3-of-3 Schnorr"
+],
+[
+    "15 0x41 0x6d1d1f8db2b4e43a51b4f5f16367045f9c1832b8103ce2bab3a21afc223351a685e84bca02c863110e7ad22d4735cd31e1908e741530e3a07863292c3ff21df901 0x41 0x6d1d1f8db2b4e43a51b4f5f16367045f9c1832b8103ce2bab3a21afc223351a685e84bca02c863110e7ad22d4735cd31e1908e741530e3a07863292c3ff21df901 0x41 0x98ac816c0adb14db2a593f6402bf70e347a219fba0ccad805a5e37a67e265c800b1d493440965634fe740852fbe4164ec45a722a463099ae8a9872896da972ef01 0x41 0xe62867a73ae91b390f6ae11717d360fbc7e813a6dc3917040556834350d5b3cfb464e7222a716f37a32ba3fee353ad4957aa3f47cf7ea1285873bc9a0e64759801",
+    "4 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "SIG_COUNT",
+    "CHECKMULTISIG 4-of-3 Schnorr"
+],
+[
+    "6 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001 0x41 0xa3fac6b1aa2cc8bb222ee379711c243b26a164ced7f2e2f4a0e184a3e53352bfaee598c6446861e5a7e819871b7ce948f5562ecf214c19dfa5112c19d74adc7101",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 (110) Schnorr"
+],
+[
+    "5 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0xa3fac6b1aa2cc8bb222ee379711c243b26a164ced7f2e2f4a0e184a3e53352bfaee598c6446861e5a7e819871b7ce948f5562ecf214c19dfa5112c19d74adc7101",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 (101) Schnorr"
+],
+[
+    "3 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 (011) Schnorr"
+],
+[
+    "3 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0xa3fac6b1aa2cc8bb222ee379711c243b26a164ced7f2e2f4a0e184a3e53352bfaee598c6446861e5a7e819871b7ce948f5562ecf214c19dfa5112c19d74adc7101",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "NULLFAIL",
+    "CHECKMULTISIG 2-of-3 Schnorr, mismatched bits Schnorr"
+],
+[
+    "7 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001 0x41 0xa3fac6b1aa2cc8bb222ee379711c243b26a164ced7f2e2f4a0e184a3e53352bfaee598c6446861e5a7e819871b7ce948f5562ecf214c19dfa5112c19d74adc7101",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "INVALID_BIT_COUNT",
+    "CHECKMULTISIG 2-of-3 Schnorr, all bits set"
+],
+[
+    "14 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BIT_RANGE",
+    "CHECKMULTISIG 2-of-3 Schnorr, extra high bit set"
+],
+[
+    "10 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BIT_RANGE",
+    "CHECKMULTISIG 2-of-3 Schnorr, too high bit set"
+],
+[
+    "2 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "INVALID_BIT_COUNT",
+    "CHECKMULTISIG 2-of-3 Schnorr, too few bits set"
+],
+[
+    "0x01 0x00 0 0",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "INVALID_BIT_COUNT",
+    "CHECKMULTISIG 2-of-3 Schnorr, with no bits set (attempt to malleate return-false)"
+],
+[
+    "0 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "SIG_BADLENGTH",
+    "CHECKMULTISIG null dummy with schnorr sigs (with SCHNORR_MULTISIG on)"
+],
+[
+    "3 0x41 0x4829a4df8042001ba6a3ee6ec1e9c26de662aade55a49f8d018acff0bac0df2edd881cf21f2a1aa651b6f703f0cde22fedaa9b8bc3451101bcac37bcb89dcc8001 0x41 0xb8c744ebecfa75ef478b2b8852795d93b99640e5c05421ef6f651d4044be6cf2db2c61d0b5395e685731556c87e501433fb6e6a3b44c113d0ba19df8fd01c18101",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "NULLFAIL",
+    "CHECKMULTISIG 2-of-3 Schnorr, misordered signatures"
+],
+[
+    "-1 0x41 0x34b9918c9cd9aa3ad0f642f1dd435164e7bed979e539b2890b8d465b70db47385c514a21b1c6659ab40b8e5395ceae8f6c67c6f4c24e940cbe0a6fe496e7d15e01 0x41 0x057e3e62dbcf8a1bd3526271ad63f568bdae4d248bd87dfcf4a80b9f6da28e0994e04c670a56e624301141f53efc9a40f7d503171809e3f70d5aee203a90567d01",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 DUP 2DUP 2DUP 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 8 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-8 Schnorr, right way to represent 0b10000001"
+],
+[
+    "0x02 0x8100 0x41 0x34b9918c9cd9aa3ad0f642f1dd435164e7bed979e539b2890b8d465b70db47385c514a21b1c6659ab40b8e5395ceae8f6c67c6f4c24e940cbe0a6fe496e7d15e01 0x41 0x057e3e62dbcf8a1bd3526271ad63f568bdae4d248bd87dfcf4a80b9f6da28e0994e04c670a56e624301141f53efc9a40f7d503171809e3f70d5aee203a90567d01",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 DUP 2DUP 2DUP 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 8 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BITFIELD_SIZE",
+    "CHECKMULTISIG 2-of-8 Schnorr, wrong way to represent 0b10000001"
+],
+[
+    "0x03 0xffff0f 0x41 0x5f4f7ffff1fa44347dbc148d51fe661b60fbc44b5abe22a04d97ecfb891bdb2568eb91aa38a426dfd7b82e0b45b57af6f3e56143fabc850ebfdfcf6a0d03c4b001 0x41 0x28add881f6fa489a9016f066022ed80acecbafc351a6d17025cf87bf2b0d9b09f6d001f5df2b1be0d1909a8fe9280b59b5a8cb6d1e37425e733ff3267ce1e1b401 0x41 0x9f66f20bca4a64fc3cc170c3e1ef2bcb62f86b719b2f8e7154407e9210fde99164d754f787bf65020dc7db3838c8aae3591eaf465f45433fcb3d0a94bea4090401",
+    "OVER DUP DUP 2DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 OVER DUP DUP 2DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 20-of-20 Schnorr"
+],
+[
+    "0x03 0x000010 0x41 0x5f4f7ffff1fa44347dbc148d51fe661b60fbc44b5abe22a04d97ecfb891bdb2568eb91aa38a426dfd7b82e0b45b57af6f3e56143fabc850ebfdfcf6a0d03c4b001 0x41 0x28add881f6fa489a9016f066022ed80acecbafc351a6d17025cf87bf2b0d9b09f6d001f5df2b1be0d1909a8fe9280b59b5a8cb6d1e37425e733ff3267ce1e1b401 0x41 0x9f66f20bca4a64fc3cc170c3e1ef2bcb62f86b719b2f8e7154407e9210fde99164d754f787bf65020dc7db3838c8aae3591eaf465f45433fcb3d0a94bea4090401",
+    "OVER DUP DUP 2DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 OVER DUP DUP 2DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BIT_RANGE",
+    "CHECKMULTISIG 20-of-20 Schnorr, checkbits +1"
+],
+[
+    "0x03 0x000010 0x41 0xbe6635b93b92ff98d0d929d3537bf2941bbc33b9b4adc14d928e1b6eae1aa1fd23455e4094764f70dd896f47b3279b57965ecad1b4d32c1000be27be8cf83ece01",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 DUP 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 3DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x15 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "PUBKEY_COUNT",
+    "CHECKMULTISIG 1-of-21 Schnorr"
+],
+[
+    "0x03 0x010000 0x41 0x020fb4d03e4c7ea6e17f5a7d03c74a6cc33fd7f949d6bc5eb8f6122a4fa5a9bc208adafc7a92030fea664f044cccfd473b8ebaae94cd7bdeec8346a02ac0e3df01",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 1-of-20 Schnorr, first key"
+],
+[
+    "0x03 0x000001 0x41 0x020fb4d03e4c7ea6e17f5a7d03c74a6cc33fd7f949d6bc5eb8f6122a4fa5a9bc208adafc7a92030fea664f044cccfd473b8ebaae94cd7bdeec8346a02ac0e3df01",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "NULLFAIL",
+    "CHECKMULTISIG 1-of-20 Schnorr, first key, wrong endianness"
+],
+[
+    "1 0x41 0xf92f753aa4238dfce5e2c68a5bb9f04c4a457c775ef247a2fda9318d2b6ab086cf7d116a24f38a045d179ff59d84c872e9fc2ef0f7574306c22380cd18da411301",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 2DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BITFIELD_SIZE",
+    "CHECKMULTISIG 1-of-20 Schnorr, truncating zeros not allowed"
+],
+[
+    "0x03 0x000008 0x41 0xdbcb269b86b9b0abb01fdf0a38b3ba9852150188bb2255e4a0794ecbbdcba52a6577ca08e0dd89b9543cae1bcf152e5444ee70759bc58a553a4c1e41144fc27001",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 1-of-20 Schnorr, last key"
+],
+[
+    "0x03 0x080000 0x41 0xdbcb269b86b9b0abb01fdf0a38b3ba9852150188bb2255e4a0794ecbbdcba52a6577ca08e0dd89b9543cae1bcf152e5444ee70759bc58a553a4c1e41144fc27001",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "NULLFAIL",
+    "CHECKMULTISIG 1-of-20 Schnorr, last key, wrong endianness"
+],
+[
+    "0x02 0x0800 0x41 0xdbcb269b86b9b0abb01fdf0a38b3ba9852150188bb2255e4a0794ecbbdcba52a6577ca08e0dd89b9543cae1bcf152e5444ee70759bc58a553a4c1e41144fc27001",
+    "1 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 DUP 2DUP 3DUP 3DUP 3DUP 3DUP 3DUP 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x01 0x14 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BITFIELD_SIZE",
+    "CHECKMULTISIG 1-of-20 Schnorr, last key, truncating zeros not allowed"
+],
+[
+    "6 0x41 0x3dfd744897afdad123edf671b9f7ad99f884cf714ada36f4c1cba12f7bdc71c6369832821a91964eb7d05552f1e32e5506d6dc2262e3ca5d1238690e3ddb075401 0x41 0x84aa5be4ebc905d6390a5be1b0101a0f2aab9563603a52c864db5deb459266cf1ea4376d378aa69a907a4e255919ecbff044d21b76dd004d34266c7ad8b84af501",
+    "2 0x02 0xbeef 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 (110) Schnorr, first key garbage"
+],
+[
+    "3 0x41 0xb7aa94db79ecf22bdfd4d986ac4ba294fc044dd75696a6f95b12fef2dee48e02e06ccda571e0d513a03c585f86a8df1223a02556c11d7f1da71ba10544e9bc9501 0x41 0x3dfd744897afdad123edf671b9f7ad99f884cf714ada36f4c1cba12f7bdc71c6369832821a91964eb7d05552f1e32e5506d6dc2262e3ca5d1238690e3ddb075401",
+    "2 0x02 0xbeef 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "PUBKEYTYPE",
+    "CHECKMULTISIG 2-of-3 (011) Schnorr, first key garbage"
+],
+[
+    "3 0x41 0xc09a62bbf5b7e45503a682cc72559b4d060edf1144023b47e765375a8e0cb017da3b0b72e2912a772989ce922f7f298890e66ff9f36c813b872682fc6b95a04b01 0x41 0x7e57eab163176c372e6f2baa2446998817b429d9cd8e3ee3a6841a95bf19fa128562848b590bf2ada480a23bbb6697f3e920594e7bf410b3b8af489862ee660601",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x02 0xbeef 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 2-of-3 (011) Schnorr, last key garbage"
+],
+[
+    "6 0x41 0x7e57eab163176c372e6f2baa2446998817b429d9cd8e3ee3a6841a95bf19fa128562848b590bf2ada480a23bbb6697f3e920594e7bf410b3b8af489862ee660601 0x41 0x64b53fe45bc169d53366fe20f7340596ba9ad86566ae725535e32c5a40d4d3dbd448bc898d0528395eca1c634e4ce422c856c6063cb947d8191127317da4a5a001",
+    "2 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x02 0xbeef 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "PUBKEYTYPE",
+    "CHECKMULTISIG 2-of-3 (110) Schnorr, last key garbage"
+],
+[
+    "0x01 0x00",
+    "0 0 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "BITFIELD_SIZE",
+    "CHECKMULTISIG 0-of-0 with SCHNORR_MULTISIG, dummy must be null"
+],
+[
+    "0x01 0x00",
+    "0 0x02 0xbeef 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "CHECKMULTISIG 0-of-1 with SCHNORR_MULTISIG, dummy need not be null"
+],
+[
+    "1 0x41 0x105e4fed395e64ca013ac1ce020ef69b9990a577fe4b74648faafb69e499f76dd53d5c64aa866924361dd3aadde9b7184bbcb4f79520396c9ed17c4d8489a59701",
+    "1 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLDUMMY,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "SCHNORR_MULTISIG implies that NULLDUMMY flag has no effect"
+],
+[
+    "1 0x41 0x17fa4dd3e62694cc7816d32b73d5646ea768072aea4926a09e159e5f57be8fd6523800b259fe2a12e27aa29a3719f19e9e4b99d7f8e465a6f19454f914ccb3ec01",
+    "1 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 1 CHECKMULTISIGVERIFY 1",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "OK",
+    "OP_CHECKMULTISIGVERIFY Schnorr"
+],
+[
+    "1 0x47 0x304402204d0106d6babcaca95277692eaa566bdc89d9f44b1106c18423345c7e9ac40d79022033a3750421038d15f15101ffdca1147a0eb980bb1b809280cb5368c50c10c42c01",
+    "1 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 1 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "SIG_NONSCHNORR",
+    "CHECKMULTISIG 1-of-1 ECDSA signature in Schnorr mode"
+],
+[
+    "7 0x47 0x304402204d69d5caa4dbab259f79fce89d3b459bbd91697c1c052a1554ff3b08b2241cbd0220330a8e17a90d51996e363cb8902fce6278c6350fa59ae12832db2f6a44d64dce01 0x41 0xea4a8d20562a950f4695dc24804565482e9fa111704886179d0c348f2b8a15fe691a305cd599c59c131677146661d5b98cb935330989a85f33afc70d0a21add101 0x41 0xce9011d76a4df05d6280b2382b4d91490dbec7c3e72dc826be1fc9b4718f627955190745cac96521ea46d6d324c7376461e225310e6cd605b9f266d170769b7901",
+    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "MINIMALDATA,NULLFAIL,SCHNORR_MULTISIG,STRICTENC",
+    "SIG_NONSCHNORR",
+    "CHECKMULTISIG 3-of-3 Schnorr with mixed-in ECDSA signature"
+],
 
 ["CHECKSEQUENCEVERIFY tests"],
 ["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on an empty stack"],
diff -Nru bitcoinabc-0.19.11-uahf/src/test/denialofservice_tests.cpp bitcoinabc-0.19.12-uahf/src/test/denialofservice_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/denialofservice_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/denialofservice_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -285,7 +285,10 @@
         LOCK(cs_main);
         Misbehaving(dummyNode1.GetId(), 10, "");
     }
-    peerLogic->SendMessages(config, &dummyNode1, interruptDummy);
+    {
+        LOCK2(cs_main, dummyNode1.cs_sendProcessing);
+        peerLogic->SendMessages(config, &dummyNode1, interruptDummy);
+    }
     BOOST_CHECK(!connman->IsBanned(addr1));
     {
         LOCK(cs_main);
diff -Nru bitcoinabc-0.19.11-uahf/src/test/mempool_tests.cpp bitcoinabc-0.19.12-uahf/src/test/mempool_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/mempool_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/mempool_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -20,6 +20,7 @@
 
 BOOST_AUTO_TEST_CASE(TestPackageAccounting) {
     CTxMemPool testPool;
+    LOCK(testPool.cs);
     TestMemPoolEntryHelper entry;
     CMutableTransaction parentOfAll;
 
@@ -229,6 +230,7 @@
     }
 
     CTxMemPool testPool;
+    LOCK(testPool.cs);
 
     // Nothing in pool, clear should do nothing:
     testPool.clear();
@@ -576,6 +578,25 @@
     sortedOrder.insert(sortedOrder.begin(), tx7.GetId().ToString());
     CheckSort<ancestor_score>(pool, sortedOrder,
                               "MempoolAncestorIndexingTest4");
+
+    // High-fee parent, low-fee child
+    // tx7 -> tx8
+    CMutableTransaction tx8 = CMutableTransaction();
+    tx8.vin.resize(1);
+    tx8.vin[0].prevout = COutPoint(tx7.GetId(), 0);
+    tx8.vin[0].scriptSig = CScript() << OP_11;
+    tx8.vout.resize(1);
+    tx8.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL;
+    tx8.vout[0].nValue = 10 * COIN;
+
+    // Check that we sort by min(feerate, ancestor_feerate):
+    // set the fee so that the ancestor feerate is above tx1/5,
+    // but the transaction's own feerate is lower
+    pool.addUnchecked(tx8.GetId(),
+                      entry.Fee(Amount(5000 * SATOSHI)).FromTx(tx8));
+    sortedOrder.insert(sortedOrder.end() - 1, tx8.GetId().ToString());
+    CheckSort<ancestor_score>(pool, sortedOrder,
+                              "MempoolAncestorIndexingTest5");
 }
 
 BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) {
diff -Nru bitcoinabc-0.19.11-uahf/src/test/rcu_tests.cpp bitcoinabc-0.19.12-uahf/src/test/rcu_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/rcu_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/rcu_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -256,7 +256,6 @@
 
     // Check various operators.
     BOOST_CHECK_EQUAL(gptr.get(), NULLPTR(RCURefTestItem));
-    BOOST_CHECK_EQUAL(&*gptr, NULLPTR(RCURefTestItem));
     BOOST_CHECK_EQUAL(gptr, NULLPTR(RCURefTestItem));
     BOOST_CHECK(!gptr);
 
diff -Nru bitcoinabc-0.19.11-uahf/src/test/rwcollection_tests.cpp bitcoinabc-0.19.12-uahf/src/test/rwcollection_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/rwcollection_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/rwcollection_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -116,7 +116,7 @@
         BOOST_CHECK_EQUAL(w["2"], "two");
         BOOST_CHECK_EQUAL(w["3"], "three");
 
-        for (const std::pair<std::string, std::string> &p : w) {
+        for (const std::pair<const std::string, std::string> &p : w) {
             BOOST_CHECK_EQUAL(w[p.first], p.second);
         }
     }
@@ -127,7 +127,7 @@
         BOOST_CHECK_EQUAL(r->find("1")->first, "1");
         BOOST_CHECK_EQUAL(r->find("1")->second, "one");
 
-        for (const std::pair<std::string, std::string> &p : r) {
+        for (const std::pair<const std::string, std::string> &p : r) {
             BOOST_CHECK_EQUAL(r->at(p.first), p.second);
         }
     }
diff -Nru bitcoinabc-0.19.11-uahf/src/test/script_tests.cpp bitcoinabc-0.19.12-uahf/src/test/script_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/script_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/script_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -36,7 +36,7 @@
 #include <vector>
 
 // Uncomment if you want to output updated JSON tests.
-// #define UPDATE_JSON_TESTS
+#define UPDATE_JSON_TESTS
 
 static const uint32_t gFlags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC;
 
@@ -60,6 +60,7 @@
     {ScriptError::INVALID_NUMBER_RANGE, "INVALID_NUMBER_RANGE"},
     {ScriptError::IMPOSSIBLE_ENCODING, "IMPOSSIBLE_ENCODING"},
     {ScriptError::INVALID_SPLIT_RANGE, "SPLIT_RANGE"},
+    {ScriptError::INVALID_BIT_COUNT, "INVALID_BIT_COUNT"},
     {ScriptError::VERIFY, "VERIFY"},
     {ScriptError::EQUALVERIFY, "EQUALVERIFY"},
     {ScriptError::CHECKMULTISIGVERIFY, "CHECKMULTISIGVERIFY"},
@@ -91,6 +92,8 @@
     {ScriptError::MUST_USE_FORKID, "MISSING_FORKID"},
     {ScriptError::DIV_BY_ZERO, "DIV_BY_ZERO"},
     {ScriptError::MOD_BY_ZERO, "MOD_BY_ZERO"},
+    {ScriptError::INVALID_BITFIELD_SIZE, "BITFIELD_SIZE"},
+    {ScriptError::INVALID_BIT_RANGE, "BIT_RANGE"},
 };
 
 static const char *FormatScriptError(ScriptError err) {
@@ -1843,6 +1846,393 @@
                             .PushECDSARecoveredPubKey(rdata, sdata)
                             .SetScriptError(ScriptError::SIG_BADLENGTH));
     }
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG << OP_NOT,
+                                "CHECKMULTISIG 2-of-3 w/ SCHNORR_MULTISIG "
+                                "(return-false still valid via legacy mode)",
+                                newmultisigflags)
+                        .Num(0)
+                        .Num(0)
+                        .Num(0));
+    tests.push_back(TestBuilder(CScript() << OP_0 << OP_0 << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 0-of-0 w/ SCHNORR_MULTISIG",
+                                newmultisigflags)
+                        .Num(0));
+    tests.push_back(
+        TestBuilder(CScript() << OP_0 << ToByteVector(ParseHex("BEEF")) << OP_1
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 0-of-1 w/ SCHNORR_MULTISIG, null dummy",
+                    newmultisigflags)
+            .Num(0));
+
+    // Tests of schnorr checkmultisig actually turned on (flag on & dummy
+    // element is not null).
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0)
+                                          << OP_1 << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 1-of-1 Schnorr",
+                                newmultisigflags)
+                        .Num(0b1)
+                        .PushSigSchnorr(keys.key0));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0)
+                                          << OP_1 << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 1-of-1 Schnorr, nonminimal bits",
+                                newmultisigflags)
+                        .Push("0100")
+                        .PushSigSchnorr(keys.key0)
+                        .SetScriptError(ScriptError::INVALID_BITFIELD_SIZE));
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 3-of-3 Schnorr",
+                                newmultisigflags)
+                        .Num(0b111)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key1)
+                        .PushSigSchnorr(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_4 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 4-of-3 Schnorr",
+                                newmultisigflags)
+                        .Num(0b1111)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key1)
+                        .PushSigSchnorr(keys.key2)
+                        .SetScriptError(ScriptError::SIG_COUNT));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 2-of-3 (110) Schnorr",
+                                newmultisigflags)
+                        .Num(0b110)
+                        .PushSigSchnorr(keys.key1)
+                        .PushSigSchnorr(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 2-of-3 (101) Schnorr",
+                                newmultisigflags)
+                        .Num(0b101)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 2-of-3 (011) Schnorr",
+                                newmultisigflags)
+                        .Num(0b011)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key1));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, mismatched bits Schnorr",
+                    newmultisigflags)
+            .Num(0b011)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key2)
+            .SetScriptError(ScriptError::SIG_NULLFAIL));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 2-of-3 Schnorr, all bits set",
+                                newmultisigflags)
+                        .Num(0b111)
+                        .PushSigSchnorr(keys.key1)
+                        .PushSigSchnorr(keys.key2)
+                        .SetScriptError(ScriptError::INVALID_BIT_COUNT));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, extra high bit set",
+                    newmultisigflags)
+            .Num(0b1110)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .SetScriptError(ScriptError::INVALID_BIT_RANGE));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, too high bit set",
+                    newmultisigflags)
+            .Num(0b1010)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .SetScriptError(ScriptError::INVALID_BIT_RANGE));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, too few bits set",
+                    newmultisigflags)
+            .Num(0b010)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .SetScriptError(ScriptError::INVALID_BIT_COUNT));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, with no bits set "
+                    "(attempt to malleate return-false)",
+                    newmultisigflags)
+            .Push("00")
+            .Num(0)
+            .Num(0)
+            .SetScriptError(ScriptError::INVALID_BIT_COUNT));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << ToByteVector(keys.pubkey2C) << OP_3
+                                          << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG null dummy with schnorr sigs "
+                                "(with SCHNORR_MULTISIG on)",
+                                newmultisigflags)
+                        .Num(0)
+                        .PushSigSchnorr(keys.key0)
+                        .PushSigSchnorr(keys.key1)
+                        .SetScriptError(ScriptError::SIG_BADLENGTH));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 Schnorr, misordered signatures",
+                    newmultisigflags)
+            .Num(0b011)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key0)
+            .SetScriptError(ScriptError::SIG_NULLFAIL));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                      << ToByteVector(keys.pubkey1C) << OP_DUP << OP_2DUP
+                      << OP_2DUP << ToByteVector(keys.pubkey2C) << OP_8
+                      << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 2-of-8 Schnorr, right way to represent 0b10000001",
+            newmultisigflags)
+            .Num(-1)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key2));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                      << ToByteVector(keys.pubkey1C) << OP_DUP << OP_2DUP
+                      << OP_2DUP << ToByteVector(keys.pubkey2C) << OP_8
+                      << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 2-of-8 Schnorr, wrong way to represent 0b10000001",
+            newmultisigflags)
+            .Num(0b10000001)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key2)
+            .SetScriptError(ScriptError::INVALID_BITFIELD_SIZE));
+    tests.push_back(
+        TestBuilder(CScript()
+                        << OP_OVER << OP_DUP << OP_DUP << OP_2DUP << OP_3DUP
+                        << OP_3DUP << OP_3DUP << OP_3DUP << 20
+                        << ToByteVector(keys.pubkey0C)
+                        << ToByteVector(keys.pubkey1C)
+                        << ToByteVector(keys.pubkey2C) << OP_OVER << OP_DUP
+                        << OP_DUP << OP_2DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                        << OP_3DUP << 20 << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 20-of-20 Schnorr", newmultisigflags)
+            .Push("ffff0f")
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key2));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_OVER << OP_DUP << OP_DUP << OP_2DUP << OP_3DUP
+                      << OP_3DUP << OP_3DUP << OP_3DUP << 20
+                      << ToByteVector(keys.pubkey0C)
+                      << ToByteVector(keys.pubkey1C)
+                      << ToByteVector(keys.pubkey2C) << OP_OVER << OP_DUP
+                      << OP_DUP << OP_2DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                      << OP_3DUP << 20 << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 20-of-20 Schnorr, checkbits +1", newmultisigflags)
+            .Push("000010")
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key2)
+            .SetScriptError(ScriptError::INVALID_BIT_RANGE));
+    tests.push_back(
+        TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0C) << OP_DUP
+                              << ToByteVector(keys.pubkey1C) << OP_3DUP
+                              << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                              << OP_3DUP << 21 << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 1-of-21 Schnorr", newmultisigflags)
+            .Push("000010")
+            .PushSigSchnorr(keys.key0)
+            .SetScriptError(ScriptError::PUBKEY_COUNT));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0C)
+                                          << ToByteVector(keys.pubkey1C)
+                                          << OP_DUP << OP_2DUP << OP_3DUP
+                                          << OP_3DUP << OP_3DUP << OP_3DUP
+                                          << OP_3DUP << 20 << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 1-of-20 Schnorr, first key",
+                                newmultisigflags)
+                        .Push("010000")
+                        .PushSigSchnorr(keys.key0));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_1 << ToByteVector(keys.pubkey0C)
+                      << ToByteVector(keys.pubkey1C) << OP_DUP << OP_2DUP
+                      << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                      << 20 << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 1-of-20 Schnorr, first key, wrong endianness",
+            newmultisigflags)
+            .Push("000001")
+            .PushSigSchnorr(keys.key0)
+            .SetScriptError(ScriptError::SIG_NULLFAIL));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_1 << ToByteVector(keys.pubkey0C) << OP_2DUP
+                      << OP_2DUP << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                      << OP_3DUP << 20 << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 1-of-20 Schnorr, truncating zeros not allowed",
+            newmultisigflags)
+            .Num(1)
+            .PushSigSchnorr(keys.key0)
+            .SetScriptError(ScriptError::INVALID_BITFIELD_SIZE));
+    tests.push_back(
+        TestBuilder(CScript()
+                        << OP_1 << ToByteVector(keys.pubkey0C) << OP_DUP
+                        << OP_2DUP << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                        << OP_3DUP << ToByteVector(keys.pubkey1C) << 20
+                        << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 1-of-20 Schnorr, last key", newmultisigflags)
+            .Push("000008")
+            .PushSigSchnorr(keys.key1));
+    tests.push_back(
+        TestBuilder(CScript()
+                        << OP_1 << ToByteVector(keys.pubkey0C) << OP_DUP
+                        << OP_2DUP << OP_3DUP << OP_3DUP << OP_3DUP << OP_3DUP
+                        << OP_3DUP << ToByteVector(keys.pubkey1C) << 20
+                        << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 1-of-20 Schnorr, last key, wrong endianness",
+                    newmultisigflags)
+            .Push("080000")
+            .PushSigSchnorr(keys.key1)
+            .SetScriptError(ScriptError::SIG_NULLFAIL));
+    tests.push_back(TestBuilder(CScript()
+                                    << OP_1 << ToByteVector(keys.pubkey0C)
+                                    << OP_DUP << OP_2DUP << OP_3DUP << OP_3DUP
+                                    << OP_3DUP << OP_3DUP << OP_3DUP
+                                    << ToByteVector(keys.pubkey1C) << 20
+                                    << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 1-of-20 Schnorr, last key, "
+                                "truncating zeros not allowed",
+                                newmultisigflags)
+                        .Push("0800")
+                        .PushSigSchnorr(keys.key1)
+                        .SetScriptError(ScriptError::INVALID_BITFIELD_SIZE));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(ParseHex("BEEF"))
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 (110) Schnorr, first key garbage",
+                    newmultisigflags)
+            .Num(0b110)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key2));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(ParseHex("BEEF"))
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(keys.pubkey2C) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 (011) Schnorr, first key garbage",
+                    newmultisigflags)
+            .Num(0b011)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .SetScriptError(ScriptError::PUBKEYTYPE));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(ParseHex("BEEF")) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 (011) Schnorr, last key garbage",
+                    newmultisigflags)
+            .Num(0b011)
+            .PushSigSchnorr(keys.key0)
+            .PushSigSchnorr(keys.key1));
+    tests.push_back(
+        TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C)
+                              << ToByteVector(keys.pubkey1C)
+                              << ToByteVector(ParseHex("BEEF")) << OP_3
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 2-of-3 (110) Schnorr, last key garbage",
+                    newmultisigflags)
+            .Num(0b110)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key2)
+            .SetScriptError(ScriptError::PUBKEYTYPE));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_0 << OP_0 << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 0-of-0 with SCHNORR_MULTISIG, dummy must be null",
+            newmultisigflags)
+            .Push("00")
+            .SetScriptError(ScriptError::INVALID_BITFIELD_SIZE));
+    tests.push_back(TestBuilder(CScript()
+                                    << OP_0 << ToByteVector(ParseHex("BEEF"))
+                                    << OP_1 << OP_CHECKMULTISIG,
+                                "CHECKMULTISIG 0-of-1 with SCHNORR_MULTISIG, "
+                                "dummy need not be null",
+                                newmultisigflags)
+                        .Push("00"));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_1 << ToByteVector(keys.pubkey0) << OP_1
+                      << OP_CHECKMULTISIG,
+            "SCHNORR_MULTISIG implies that NULLDUMMY flag has no effect",
+            newmultisigflags | SCRIPT_VERIFY_NULLDUMMY)
+            .Num(0b1)
+            .PushSigSchnorr(keys.key0));
+    tests.push_back(
+        TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0) << OP_1
+                              << OP_CHECKMULTISIGVERIFY << OP_1,
+                    "OP_CHECKMULTISIGVERIFY Schnorr", newmultisigflags)
+            .Num(0b1)
+            .PushSigSchnorr(keys.key0));
+    tests.push_back(
+        TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0) << OP_1
+                              << OP_CHECKMULTISIG,
+                    "CHECKMULTISIG 1-of-1 ECDSA signature in Schnorr mode",
+                    newmultisigflags)
+            .Num(0b1)
+            .PushSigECDSA(keys.key0)
+            .SetScriptError(ScriptError::SIG_NONSCHNORR));
+    tests.push_back(
+        TestBuilder(
+            CScript() << OP_3 << ToByteVector(keys.pubkey0C)
+                      << ToByteVector(keys.pubkey1C)
+                      << ToByteVector(keys.pubkey2C) << OP_3
+                      << OP_CHECKMULTISIG,
+            "CHECKMULTISIG 3-of-3 Schnorr with mixed-in ECDSA signature",
+            newmultisigflags)
+            .Num(0b111)
+            .PushSigECDSA(keys.key0)
+            .PushSigSchnorr(keys.key1)
+            .PushSigSchnorr(keys.key2)
+            .SetScriptError(ScriptError::SIG_NONSCHNORR));
 
     std::set<std::string> tests_set;
 
diff -Nru bitcoinabc-0.19.11-uahf/src/test/sigencoding_tests.cpp bitcoinabc-0.19.12-uahf/src/test/sigencoding_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/sigencoding_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/sigencoding_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -31,13 +31,13 @@
         BaseSigHashType::ALL, BaseSigHashType::NONE, BaseSigHashType::SINGLE};
 
     std::vector<SigHashType> baseSigHashes;
-    for (const BaseSigHashType baseType : allBaseTypes) {
+    for (const BaseSigHashType &baseType : allBaseTypes) {
         const SigHashType baseSigHash = SigHashType().withBaseType(baseType);
         baseSigHashes.push_back(baseSigHash);
         baseSigHashes.push_back(baseSigHash.withAnyoneCanPay(true));
     }
 
-    for (const SigHashType baseSigHash : baseSigHashes) {
+    for (const SigHashType &baseSigHash : baseSigHashes) {
         // Check the signature with the proper forkid flag.
         SigHashType sigHash = baseSigHash.withForkId(hasForkId);
         valtype validSig = SignatureWithHashType(vchSig, sigHash);
diff -Nru bitcoinabc-0.19.11-uahf/src/test/test_bitcoin.cpp bitcoinabc-0.19.12-uahf/src/test/test_bitcoin.cpp
--- bitcoinabc-0.19.11-uahf/src/test/test_bitcoin.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/test_bitcoin.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -64,10 +64,6 @@
     fCheckBlockIndex = true;
     SelectParams(chainName);
     noui_connect();
-
-    // Set config parameters to default.
-    GlobalConfig config;
-    config.SetMaxBlockSize(DEFAULT_MAX_BLOCK_SIZE);
 }
 
 BasicTestingSetup::~BasicTestingSetup() {
@@ -186,9 +182,9 @@
               });
 
     // IncrementExtraNonce creates a valid coinbase and merkleRoot
-    unsigned int extraNonce = 0;
     {
         LOCK(cs_main);
+        unsigned int extraNonce = 0;
         IncrementExtraNonce(config, &block, chainActive.Tip(), extraNonce);
     }
 
@@ -198,7 +194,7 @@
 
     std::shared_ptr<const CBlock> shared_pblock =
         std::make_shared<const CBlock>(block);
-    ProcessNewBlock(GetConfig(), shared_pblock, true, nullptr);
+    ProcessNewBlock(config, shared_pblock, true, nullptr);
 
     CBlock result = block;
     return result;
diff -Nru bitcoinabc-0.19.11-uahf/src/test/uint256_tests.cpp bitcoinabc-0.19.12-uahf/src/test/uint256_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/uint256_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/uint256_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -280,4 +280,16 @@
     BOOST_CHECK(R2L.GetHex() == UintToArith256(R2L).GetHex());
 }
 
+BOOST_AUTO_TEST_CASE(operator_with_self) {
+    arith_uint256 v = UintToArith256(uint256S("02"));
+    v *= v;
+    BOOST_CHECK(v == UintToArith256(uint256S("04")));
+    v /= v;
+    BOOST_CHECK(v == UintToArith256(uint256S("01")));
+    v += v;
+    BOOST_CHECK(v == UintToArith256(uint256S("02")));
+    v -= v;
+    BOOST_CHECK(v == UintToArith256(uint256S("0")));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff -Nru bitcoinabc-0.19.11-uahf/src/test/util_tests.cpp bitcoinabc-0.19.12-uahf/src/test/util_tests.cpp
--- bitcoinabc-0.19.11-uahf/src/test/util_tests.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/test/util_tests.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -1205,9 +1205,9 @@
 
 static void TestOtherProcess(fs::path dirname, std::string lockname, int fd) {
     char ch;
-    int rv;
     while (true) {
-        rv = read(fd, &ch, 1); // Wait for command
+        // Wait for command
+        int rv = read(fd, &ch, 1);
         assert(rv == 1);
         switch (ch) {
             case LockCommand:
diff -Nru bitcoinabc-0.19.11-uahf/src/txmempool.cpp bitcoinabc-0.19.12-uahf/src/txmempool.cpp
--- bitcoinabc-0.19.11-uahf/src/txmempool.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/txmempool.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -89,12 +89,12 @@
         setAllDescendants.insert(cit);
         stageEntries.erase(cit);
         const setEntries &setChildren = GetMemPoolChildren(cit);
-        for (const txiter childEntry : setChildren) {
+        for (txiter childEntry : setChildren) {
             cacheMap::iterator cacheIt = cachedDescendants.find(childEntry);
             if (cacheIt != cachedDescendants.end()) {
                 // We've already calculated this one, just add the entries for
                 // this set but don't traverse again.
-                for (const txiter cacheEntry : cacheIt->second) {
+                for (txiter cacheEntry : cacheIt->second) {
                     setAllDescendants.insert(cacheEntry);
                 }
             } else if (!setAllDescendants.count(childEntry)) {
@@ -394,7 +394,7 @@
 
 CTxMemPool::~CTxMemPool() {}
 
-bool CTxMemPool::isSpent(const COutPoint &outpoint) {
+bool CTxMemPool::isSpent(const COutPoint &outpoint) const {
     LOCK(cs);
     return mapNextTx.count(outpoint);
 }
diff -Nru bitcoinabc-0.19.11-uahf/src/txmempool.h bitcoinabc-0.19.12-uahf/src/txmempool.h
--- bitcoinabc-0.19.11-uahf/src/txmempool.h	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/txmempool.h	2019-08-16 12:22:08.000000000 +0000
@@ -243,24 +243,14 @@
 class CompareTxMemPoolEntryByDescendantScore {
 public:
     bool operator()(const CTxMemPoolEntry &a, const CTxMemPoolEntry &b) const {
-        bool fUseADescendants = UseDescendantScore(a);
-        bool fUseBDescendants = UseDescendantScore(b);
+        double a_mod_fee, a_size, b_mod_fee, b_size;
 
-        double aModFee = (fUseADescendants ? a.GetModFeesWithDescendants()
-                                           : a.GetModifiedFee()) /
-                         SATOSHI;
-        double aSize =
-            fUseADescendants ? a.GetSizeWithDescendants() : a.GetTxSize();
-
-        double bModFee = (fUseBDescendants ? b.GetModFeesWithDescendants()
-                                           : b.GetModifiedFee()) /
-                         SATOSHI;
-        double bSize =
-            fUseBDescendants ? b.GetSizeWithDescendants() : b.GetTxSize();
+        GetModFeeAndSize(a, a_mod_fee, a_size);
+        GetModFeeAndSize(b, b_mod_fee, b_size);
 
         // Avoid division by rewriting (a/b > c/d) as (a*d > c*b).
-        double f1 = aModFee * bSize;
-        double f2 = aSize * bModFee;
+        double f1 = a_mod_fee * b_size;
+        double f2 = a_size * b_mod_fee;
 
         if (f1 == f2) {
             return a.GetTime() >= b.GetTime();
@@ -268,23 +258,36 @@
         return f1 < f2;
     }
 
-    // Calculate which score to use for an entry (avoiding division).
-    bool UseDescendantScore(const CTxMemPoolEntry &a) const {
+    // Return the fee/size we're using for sorting this entry.
+    void GetModFeeAndSize(const CTxMemPoolEntry &a, double &mod_fee,
+                          double &size) const {
+        // Compare feerate with descendants to feerate of the transaction, and
+        // return the fee/size for the max.
         double f1 = a.GetSizeWithDescendants() * (a.GetModifiedFee() / SATOSHI);
         double f2 = a.GetTxSize() * (a.GetModFeesWithDescendants() / SATOSHI);
-        return f2 > f1;
+
+        if (f2 > f1) {
+            mod_fee = a.GetModFeesWithDescendants() / SATOSHI;
+            size = a.GetSizeWithDescendants();
+        } else {
+            mod_fee = a.GetModifiedFee() / SATOSHI;
+            size = a.GetTxSize();
+        }
     }
 };
 
 /** \class CompareTxMemPoolEntryByScore
  *
- *  Sort by score of entry ((fee+delta)/size) in descending order
+ *  Sort by feerate of entry (fee/size) in descending order
+ *  This is only used for transaction relay, so we use GetFee()
+ *  instead of GetModifiedFee() to avoid leaking prioritization
+ *  information via the sort order.
  */
 class CompareTxMemPoolEntryByScore {
 public:
     bool operator()(const CTxMemPoolEntry &a, const CTxMemPoolEntry &b) const {
-        double f1 = b.GetTxSize() * (a.GetModifiedFee() / SATOSHI);
-        double f2 = a.GetTxSize() * (b.GetModifiedFee() / SATOSHI);
+        double f1 = b.GetTxSize() * (a.GetFee() / SATOSHI);
+        double f2 = a.GetTxSize() * (b.GetFee() / SATOSHI);
         if (f1 == f2) {
             return b.GetTx().GetId() < a.GetTx().GetId();
         }
@@ -299,25 +302,45 @@
     }
 };
 
+/** \class CompareTxMemPoolEntryByAncestorScore
+ *
+ *  Sort an entry by min(score/size of entry's tx, score/size with all
+ * ancestors).
+ */
 class CompareTxMemPoolEntryByAncestorFee {
 public:
-    bool operator()(const CTxMemPoolEntry &a, const CTxMemPoolEntry &b) const {
-        double aFees = a.GetModFeesWithAncestors() / SATOSHI;
-        double aSize = a.GetSizeWithAncestors();
+    template <typename T> bool operator()(const T &a, const T &b) const {
+        double a_mod_fee, a_size, b_mod_fee, b_size;
 
-        double bFees = b.GetModFeesWithAncestors() / SATOSHI;
-        double bSize = b.GetSizeWithAncestors();
+        GetModFeeAndSize(a, a_mod_fee, a_size);
+        GetModFeeAndSize(b, b_mod_fee, b_size);
 
         // Avoid division by rewriting (a/b > c/d) as (a*d > c*b).
-        double f1 = aFees * bSize;
-        double f2 = aSize * bFees;
+        double f1 = a_mod_fee * b_size;
+        double f2 = a_size * b_mod_fee;
 
         if (f1 == f2) {
             return a.GetTx().GetId() < b.GetTx().GetId();
         }
-
         return f1 > f2;
     }
+
+    // Return the fee/size we're using for sorting this entry.
+    template <typename T>
+    void GetModFeeAndSize(const T &a, double &mod_fee, double &size) const {
+        // Compare feerate with ancestors to feerate of the transaction, and
+        // return the fee/size for the min.
+        double f1 = a.GetSizeWithAncestors() * (a.GetModifiedFee() / SATOSHI);
+        double f2 = a.GetTxSize() * (a.GetModFeesWithAncestors() / SATOSHI);
+
+        if (f1 > f2) {
+            mod_fee = a.GetModFeesWithAncestors() / SATOSHI;
+            size = a.GetSizeWithAncestors();
+        } else {
+            mod_fee = a.GetModifiedFee() / SATOSHI;
+            size = a.GetTxSize();
+        }
+    }
 };
 
 // Multi_index tag names
@@ -395,8 +418,11 @@
  *
  * mapTx is a boost::multi_index that sorts the mempool on 4 criteria:
  * - transaction hash
- * - feerate [we use max(feerate of tx, feerate of tx with all descendants)]
+ * - descendant feerate [we use max(feerate of tx, feerate of tx with all
+ * descendants)]
  * - time in mempool
+ * - ancestor feerate [we use min(feerate of tx, feerate of tx with all
+ * unconfirmed ancestors)]
  *
  * Note: the term "descendant" refers to in-mempool transactions that depend on
  * this one, while "ancestor" refers to in-mempool transactions that a given
@@ -579,7 +605,7 @@
     void _clear() EXCLUSIVE_LOCKS_REQUIRED(cs);
     bool CompareDepthAndScore(const uint256 &hasha, const uint256 &hashb);
     void queryHashes(std::vector<uint256> &vtxid);
-    bool isSpent(const COutPoint &outpoint);
+    bool isSpent(const COutPoint &outpoint) const;
     unsigned int GetTransactionsUpdated() const;
     void AddTransactionsUpdated(unsigned int n);
     /**
diff -Nru bitcoinabc-0.19.11-uahf/src/validation.cpp bitcoinabc-0.19.12-uahf/src/validation.cpp
--- bitcoinabc-0.19.11-uahf/src/validation.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/validation.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -420,6 +420,11 @@
     return IsMagneticAnomalyEnabled(config, chainActive.Tip());
 }
 
+static bool IsGravitonEnabledForCurrentBlock(const Config &config) {
+    AssertLockHeld(cs_main);
+    return IsGravitonEnabled(config, chainActive.Tip());
+}
+
 // Command-line argument "-replayprotectionactivationtime=<timestamp>" will
 // cause the node to switch to replay protected SigHash ForkID value when the
 // median timestamp of the previous 11 blocks is greater than or equal to
@@ -553,7 +558,7 @@
         view.SetBackend(viewMemPool);
 
         // Do all inputs exist?
-        for (const CTxIn txin : tx.vin) {
+        for (const CTxIn &txin : tx.vin) {
             if (!pcoinsTip->HaveCoinInCache(txin.prevout)) {
                 coins_to_uncache.push_back(txin.prevout);
             }
@@ -744,6 +749,11 @@
             extraFlags |= SCRIPT_VERIFY_CHECKDATASIG_SIGOPS;
         }
 
+        if (IsGravitonEnabledForCurrentBlock(config)) {
+            extraFlags |= SCRIPT_ENABLE_SCHNORR_MULTISIG;
+            extraFlags |= SCRIPT_VERIFY_MINIMALDATA;
+        }
+
         // Make sure whatever we need to activate is actually activated.
         const uint32_t scriptVerifyFlags =
             STANDARD_SCRIPT_VERIFY_FLAGS | extraFlags;
@@ -1243,6 +1253,7 @@
         if (pvChecks) {
             pvChecks->push_back(std::move(check));
         } else if (!check()) {
+            ScriptError scriptError = check.GetScriptError();
             // Compute flags without the optional standardness flags.
             // This differs from MANDATORY_SCRIPT_VERIFY_FLAGS as it contains
             // additional upgrade flags (see AcceptToMemoryPoolWorker variable
@@ -1260,8 +1271,23 @@
                     return state.Invalid(
                         false, REJECT_NONSTANDARD,
                         strprintf("non-mandatory-script-verify-flag (%s)",
-                                  ScriptErrorString(check.GetScriptError())));
+                                  ScriptErrorString(scriptError)));
                 }
+                // update the error message to reflect the mandatory violation.
+                scriptError = check2.GetScriptError();
+            }
+
+            // Before banning, we need to check whether the transaction would
+            // be valid on the other side of the upgrade, so as to avoid
+            // splitting the network between upgraded and non-upgraded nodes.
+            CScriptCheck check3(scriptPubKey, amount, tx, i,
+                                mandatoryFlags ^ SCRIPT_ENABLE_SCHNORR_MULTISIG,
+                                sigCacheStore, txdata);
+            if (check3()) {
+                return state.Invalid(
+                    false, REJECT_INVALID,
+                    strprintf("upgrade-conditional-script-failure (%s)",
+                              ScriptErrorString(scriptError)));
             }
 
             // Failures of other flags indicate a transaction that is invalid in
@@ -1273,7 +1299,7 @@
             return state.DoS(
                 100, false, REJECT_INVALID,
                 strprintf("mandatory-script-verify-flag-failed (%s)",
-                          ScriptErrorString(check.GetScriptError())));
+                          ScriptErrorString(scriptError)));
         }
     }
 
@@ -1599,6 +1625,11 @@
         flags |= SCRIPT_VERIFY_CLEANSTACK;
     }
 
+    if (IsGravitonEnabled(config, pindex)) {
+        flags |= SCRIPT_ENABLE_SCHNORR_MULTISIG;
+        flags |= SCRIPT_VERIFY_MINIMALDATA;
+    }
+
     // We make sure this node will have replay protection during the next hard
     // fork.
     if (IsReplayProtectionEnabled(config, pindex)) {
@@ -3027,7 +3058,11 @@
     if (invalidate) {
         InvalidChainFound(pindex);
     }
-    uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
+
+    // Only notify about a new block tip if the active chain was modified.
+    if (pindex_was_in_chain) {
+        uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
+    }
     return true;
 }
 
@@ -4335,7 +4370,7 @@
     // Calculate nChainWork
     std::vector<std::pair<int, CBlockIndex *>> vSortedByHeight;
     vSortedByHeight.reserve(mapBlockIndex.size());
-    for (const std::pair<uint256, CBlockIndex *> &item : mapBlockIndex) {
+    for (const std::pair<const uint256, CBlockIndex *> &item : mapBlockIndex) {
         CBlockIndex *pindex = item.second;
         vSortedByHeight.push_back(std::make_pair(pindex->nHeight, pindex));
     }
@@ -4428,7 +4463,7 @@
     // Check presence of blk files
     LogPrintf("Checking all blk files are present...\n");
     std::set<int> setBlkDataFiles;
-    for (const std::pair<uint256, CBlockIndex *> &item : mapBlockIndex) {
+    for (const std::pair<const uint256, CBlockIndex *> &item : mapBlockIndex) {
         CBlockIndex *pindex = item.second;
         if (pindex->nStatus.hasData()) {
             setBlkDataFiles.insert(pindex->nFile);
diff -Nru bitcoinabc-0.19.11-uahf/src/wallet/init.cpp bitcoinabc-0.19.12-uahf/src/wallet/init.cpp
--- bitcoinabc-0.19.11-uahf/src/wallet/init.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/wallet/init.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -314,7 +314,7 @@
     // Keep track of each wallet absolute path to detect duplicates.
     std::set<fs::path> wallet_paths;
 
-    for (const auto wallet_file : wallet_files) {
+    for (const auto &wallet_file : wallet_files) {
         fs::path wallet_path = fs::absolute(wallet_file, GetWalletDir());
 
         if (!wallet_paths.insert(wallet_path).second) {
diff -Nru bitcoinabc-0.19.11-uahf/src/wallet/rpcdump.cpp bitcoinabc-0.19.12-uahf/src/wallet/rpcdump.cpp
--- bitcoinabc-0.19.11-uahf/src/wallet/rpcdump.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/wallet/rpcdump.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -205,8 +205,8 @@
 
     if (request.fHelp || request.params.size() > 0) {
         throw std::runtime_error("abortrescan\n"
-                                 "\nStops current wallet rescan triggered e.g. "
-                                 "by an importprivkey call.\n"
+                                 "\nStops current wallet rescan triggered by "
+                                 "an RPC call, e.g. by an importprivkey call.\n"
                                  "\nExamples:\n"
                                  "\nImport a private key\n" +
                                  HelpExampleCli("importprivkey", "\"mykey\"") +
diff -Nru bitcoinabc-0.19.11-uahf/src/wallet/rpcwallet.cpp bitcoinabc-0.19.12-uahf/src/wallet/rpcwallet.cpp
--- bitcoinabc-0.19.11-uahf/src/wallet/rpcwallet.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/wallet/rpcwallet.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -133,7 +133,7 @@
     entry.pushKV("time", wtx.GetTxTime());
     entry.pushKV("timereceived", (int64_t)wtx.nTimeReceived);
 
-    for (const std::pair<std::string, std::string> &item : wtx.mapValue) {
+    for (const std::pair<const std::string, std::string> &item : wtx.mapValue) {
         entry.pushKV(item.first, item.second);
     }
 }
@@ -444,7 +444,7 @@
 
     // Find all addresses that have the given account
     UniValue ret(UniValue::VARR);
-    for (const std::pair<CTxDestination, CAddressBookData> &item :
+    for (const std::pair<const CTxDestination, CAddressBookData> &item :
          pwallet->mapAddressBook) {
         const CTxDestination &dest = item.first;
         const std::string &strName = item.second.name;
@@ -804,7 +804,7 @@
 
     // Tally
     Amount nAmount = Amount::zero();
-    for (const std::pair<uint256, CWalletTx> &pairWtx : pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
 
         CValidationState state;
@@ -878,7 +878,7 @@
 
     // Tally
     Amount nAmount = Amount::zero();
-    for (const std::pair<uint256, CWalletTx> &pairWtx : pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
         CValidationState state;
         if (wtx.IsCoinBase() || !ContextualCheckTransactionForCurrentBlock(
@@ -1523,7 +1523,7 @@
 
     // Tally
     std::map<CTxDestination, tallyitem> mapTally;
-    for (const std::pair<uint256, CWalletTx> &pairWtx : pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
 
         CValidationState state;
@@ -2117,7 +2117,7 @@
     }
 
     std::map<std::string, Amount> mapAccountBalances;
-    for (const std::pair<CTxDestination, CAddressBookData> &entry :
+    for (const std::pair<const CTxDestination, CAddressBookData> &entry :
          pwallet->mapAddressBook) {
         // This address belongs to me
         if (IsMine(*pwallet, entry.first) & includeWatchonly) {
@@ -2125,7 +2125,7 @@
         }
     }
 
-    for (const std::pair<uint256, CWalletTx> &pairWtx : pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
         Amount nFee;
         std::string strSentAccount;
@@ -2159,7 +2159,7 @@
     }
 
     UniValue ret(UniValue::VOBJ);
-    for (const std::pair<std::string, Amount> &accountBalance :
+    for (const std::pair<const std::string, Amount> &accountBalance :
          mapAccountBalances) {
         ret.pushKV(accountBalance.first,
                    ValueFromAmount(accountBalance.second));
@@ -2329,7 +2329,7 @@
 
     UniValue transactions(UniValue::VARR);
 
-    for (const std::pair<uint256, CWalletTx> &pairWtx : pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         CWalletTx tx = pairWtx.second;
 
         if (depth == -1 || tx.GetDepthInMainChain() < depth) {
diff -Nru bitcoinabc-0.19.11-uahf/src/wallet/wallet.cpp bitcoinabc-0.19.12-uahf/src/wallet/wallet.cpp
--- bitcoinabc-0.19.11-uahf/src/wallet/wallet.cpp	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/src/wallet/wallet.cpp	2019-08-16 12:22:08.000000000 +0000
@@ -1804,6 +1804,11 @@
 
     CBlockIndex *pindex = pindexStart;
     CBlockIndex *ret = nullptr;
+
+    if (pindex) {
+        LogPrintf("Rescan started from block %d...\n", pindex->nHeight);
+    }
+
     {
         fAbortRescan = false;
 
@@ -3516,7 +3521,7 @@
         LOCK(cs_wallet);
 
         // Delete destdata tuples associated with address.
-        for (const std::pair<std::string, std::string> &item :
+        for (const std::pair<const std::string, std::string> &item :
              mapAddressBook[address].destdata) {
             WalletBatch(*database).EraseDestData(address, item.first);
         }
@@ -3836,7 +3841,7 @@
         if (pcoin->tx->vin.size() > 0) {
             bool any_mine = false;
             // Group all input addresses with each other.
-            for (const auto txin : pcoin->tx->vin) {
+            for (const auto &txin : pcoin->tx->vin) {
                 CTxDestination address;
                 // If this input isn't mine, ignore it.
                 if (!IsMine(txin)) {
@@ -3856,7 +3861,7 @@
 
             // Group change with input addresses.
             if (any_mine) {
-                for (const auto txout : pcoin->tx->vout) {
+                for (const auto &txout : pcoin->tx->vout) {
                     if (IsChange(txout)) {
                         CTxDestination txoutAddr;
                         if (!ExtractDestination(txout.scriptPubKey,
@@ -3933,7 +3938,7 @@
 CWallet::GetLabelAddresses(const std::string &label) const {
     LOCK(cs_wallet);
     std::set<CTxDestination> result;
-    for (const std::pair<CTxDestination, CAddressBookData> &item :
+    for (const std::pair<const CTxDestination, CAddressBookData> &item :
          mapAddressBook) {
         const CTxDestination &address = item.first;
         const std::string &strName = item.second.name;
diff -Nru bitcoinabc-0.19.11-uahf/test/CMakeLists.txt bitcoinabc-0.19.12-uahf/test/CMakeLists.txt
--- bitcoinabc-0.19.11-uahf/test/CMakeLists.txt	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/CMakeLists.txt	2019-08-16 12:22:08.000000000 +0000
@@ -49,6 +49,10 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/util/bitcoin-util-test.py
 	${CMAKE_CURRENT_BINARY_DIR}/util/bitcoin-util-test.py
 )
+make_link(
+	${CMAKE_CURRENT_SOURCE_DIR}/util/rpcauth-test.py
+	${CMAKE_CURRENT_BINARY_DIR}/util/rpcauth-test.py
+)
 
 add_custom_target(check-functional
 	COMMAND
@@ -75,3 +79,15 @@
 
 	add_dependencies(check check-bitcoin-util)
 endif()
+
+add_custom_target(check-rpcauth
+	COMMAND
+		${CMAKE_COMMAND} -E echo "Running test/util/rpcauth-test.py..."
+	COMMAND
+		./util/rpcauth-test.py
+	DEPENDS
+		../share/rpcauth/rpcauth.py
+		${CMAKE_CURRENT_BINARY_DIR}/util/rpcauth-test.py
+)
+
+add_dependencies(check check-rpcauth)
diff -Nru bitcoinabc-0.19.11-uahf/test/config.ini.in bitcoinabc-0.19.12-uahf/test/config.ini.in
--- bitcoinabc-0.19.11-uahf/test/config.ini.in	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/config.ini.in	2019-08-16 12:22:08.000000000 +0000
@@ -9,6 +9,7 @@
 SRCDIR=@abs_top_srcdir@
 BUILDDIR=@abs_top_builddir@
 EXEEXT=@EXEEXT@
+RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py
 
 [components]
 # Which components are enabled. These are commented out by `configure` if they were disabled when running config.
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-finalize-block.py bitcoinabc-0.19.12-uahf/test/functional/abc-finalize-block.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-finalize-block.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-finalize-block.py	2019-08-16 12:22:08.000000000 +0000
@@ -226,7 +226,7 @@
         assert_equal(node.getbestblockhash(), alt_node_new_tip)
         assert_equal(node.getfinalizedblockhash(), fork_block)
 
-        ### TEST FINALIZATION DELAY ###
+        # TEST FINALIZATION DELAY
 
         self.log.info("Check that finalization delay prevents eclipse attacks")
         # Because there has been no delay since the beginning of this test,
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-mempool-accept-txn.py bitcoinabc-0.19.12-uahf/test/functional/abc-mempool-accept-txn.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-mempool-accept-txn.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-mempool-accept-txn.py	2019-08-16 12:22:08.000000000 +0000
@@ -194,7 +194,6 @@
 
         # shorthand for functions
         block = self.next_block
-        create_tx = self.create_tx
 
         # shorthand for variables
         node = self.nodes[0]
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-minimaldata-activation.py bitcoinabc-0.19.12-uahf/test/functional/abc-minimaldata-activation.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-minimaldata-activation.py	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-minimaldata-activation.py	2019-08-16 12:22:08.000000000 +0000
@@ -0,0 +1,266 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Bitcoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""
+This tests the activation of MINIMALDATA rule to consensus (from standard).
+- test rejection in mempool, with error changing before/after activation.
+- test acceptance in blocks before activation, and rejection after.
+- check non-banning for peers who send invalid txns that would have been valid
+on the other side of the upgrade.
+
+Derived from abc-schnorr.py
+"""
+
+from test_framework.blocktools import (
+    create_block,
+    create_coinbase,
+    create_transaction,
+    make_conform_to_ctor,
+)
+from test_framework.messages import (
+    CBlock,
+    COutPoint,
+    CTransaction,
+    CTxIn,
+    CTxOut,
+    FromHex,
+    ToHex,
+)
+from test_framework.mininode import (
+    network_thread_join,
+    network_thread_start,
+    P2PDataStore,
+)
+from test_framework.script import (
+    CScript,
+    OP_ADD,
+    OP_TRUE,
+)
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.txtools import pad_tx
+from test_framework.util import assert_equal, assert_raises_rpc_error
+
+# the upgrade activation time, which we artificially set far into the future
+GRAVITON_START_TIME = 2000000000
+
+# If we don't do this, autoreplay protection will activate before graviton and
+# all our sigs will mysteriously fail.
+REPLAY_PROTECTION_START_TIME = GRAVITON_START_TIME * 2
+
+
+# Both before and after the upgrade, minimal push violations are rejected as nonstandard.
+# After the upgrade they are actually invalid, but we get the same error since MINIMALDATA is internally marked as a "standardness" flag.
+MINIMALPUSH_ERROR = dict(reject_code=64,
+                         reject_reason=b'non-mandatory-script-verify-flag (Data push larger than necessary)')
+
+# Blocks with invalid scripts give this error:
+BADINPUTS_ERROR = dict(reject_code=16,
+                       reject_reason=b'blk-bad-inputs')
+
+
+def rpc_error(*, reject_code, reject_reason):
+    # RPC indicates rejected items in a slightly different way than p2p.
+    return '{:s} (code {:d})'.format(reject_reason.decode(), reject_code)
+
+
+class SchnorrTest(BitcoinTestFramework):
+
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.block_heights = {}
+        self.extra_args = [["-gravitonactivationtime={}".format(
+            GRAVITON_START_TIME),
+            "-replayprotectionactivationtime={}".format(
+            REPLAY_PROTECTION_START_TIME)]]
+
+    def bootstrap_p2p(self, *, num_connections=1):
+        """Add a P2P connection to the node.
+
+        Helper to connect and wait for version handshake."""
+        for _ in range(num_connections):
+            self.nodes[0].add_p2p_connection(P2PDataStore())
+        network_thread_start()
+        self.nodes[0].p2p.wait_for_verack()
+
+    def reconnect_p2p(self, **kwargs):
+        """Tear down and bootstrap the P2P connection to the node.
+
+        The node gets disconnected several times in this test. This helper
+        method reconnects the p2p and restarts the network thread."""
+        self.nodes[0].disconnect_p2ps()
+        network_thread_join()
+        self.bootstrap_p2p(**kwargs)
+
+    def getbestblock(self, node):
+        """Get the best block. Register its height so we can use build_block."""
+        block_height = node.getblockcount()
+        blockhash = node.getblockhash(block_height)
+        block = FromHex(CBlock(), node.getblock(blockhash, 0))
+        block.calc_sha256()
+        self.block_heights[block.sha256] = block_height
+        return block
+
+    def build_block(self, parent, transactions=(), nTime=None):
+        """Make a new block with an OP_1 coinbase output.
+
+        Requires parent to have its height registered."""
+        parent.calc_sha256()
+        block_height = self.block_heights[parent.sha256] + 1
+        block_time = (parent.nTime + 1) if nTime is None else nTime
+
+        block = create_block(
+            parent.sha256, create_coinbase(block_height), block_time)
+        block.vtx.extend(transactions)
+        make_conform_to_ctor(block)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.solve()
+        self.block_heights[block.sha256] = block_height
+        return block
+
+    def check_for_ban_on_rejected_tx(self, tx, reject_code=None, reject_reason=None):
+        """Check we are disconnected when sending a txn that the node rejects.
+
+        (Can't actually get banned, since bitcoind won't ban local peers.)"""
+        self.nodes[0].p2p.send_txs_and_test(
+            [tx], self.nodes[0], success=False, expect_disconnect=True, reject_code=reject_code, reject_reason=reject_reason)
+        self.reconnect_p2p()
+
+    def check_for_no_ban_on_rejected_tx(self, tx, reject_code, reject_reason):
+        """Check we are not disconnected when sending a txn that the node rejects."""
+        self.nodes[0].p2p.send_txs_and_test(
+            [tx], self.nodes[0], success=False, reject_code=reject_code, reject_reason=reject_reason)
+
+    def check_for_ban_on_rejected_block(self, block, reject_code=None, reject_reason=None):
+        """Check we are disconnected when sending a block that the node rejects.
+
+        (Can't actually get banned, since bitcoind won't ban local peers.)"""
+        self.nodes[0].p2p.send_blocks_and_test(
+            [block], self.nodes[0], success=False, reject_code=reject_code, reject_reason=reject_reason)
+        self.nodes[0].p2p.wait_for_disconnect()
+        self.reconnect_p2p()
+
+    def run_test(self):
+        node, = self.nodes
+
+        self.bootstrap_p2p()
+
+        tip = self.getbestblock(node)
+
+        self.log.info("Create some blocks with OP_1 coinbase for spending.")
+        blocks = []
+        for _ in range(10):
+            tip = self.build_block(tip)
+            blocks.append(tip)
+        node.p2p.send_blocks_and_test(blocks, node, success=True)
+        spendable_outputs = [block.vtx[0] for block in blocks]
+
+        self.log.info("Mature the blocks and get out of IBD.")
+        node.generate(100)
+
+        tip = self.getbestblock(node)
+
+        self.log.info("Setting up spends to test and mining the fundings.")
+        fundings = []
+
+        def create_fund_and_spend_tx():
+            spendfrom = spendable_outputs.pop()
+
+            script = CScript([OP_ADD])
+
+            value = spendfrom.vout[0].nValue
+
+            # Fund transaction
+            txfund = create_transaction(spendfrom, 0, b'', value, script)
+            txfund.rehash()
+            fundings.append(txfund)
+
+            # Spend transaction
+            txspend = CTransaction()
+            txspend.vout.append(
+                CTxOut(value-1000, CScript([OP_TRUE])))
+            txspend.vin.append(
+                CTxIn(COutPoint(txfund.sha256, 0), b''))
+
+            # Sign the transaction
+            txspend.vin[0].scriptSig = CScript(
+                b'\x01\x01\x51')  # PUSH1(0x01) OP_1
+            pad_tx(txspend)
+            txspend.rehash()
+
+            return txspend
+
+        # make a few of these, which are nonstandard before upgrade and invalid after.
+        nonminimaltx = create_fund_and_spend_tx()
+        nonminimaltx_2 = create_fund_and_spend_tx()
+        nonminimaltx_3 = create_fund_and_spend_tx()
+
+        tip = self.build_block(tip, fundings)
+        node.p2p.send_blocks_and_test([tip], node)
+
+        self.log.info("Start preupgrade tests")
+
+        self.log.info("Sending rejected transactions via RPC")
+        assert_raises_rpc_error(-26, rpc_error(**MINIMALPUSH_ERROR),
+                                node.sendrawtransaction, ToHex(nonminimaltx))
+        assert_raises_rpc_error(-26, rpc_error(**MINIMALPUSH_ERROR),
+                                node.sendrawtransaction, ToHex(nonminimaltx_2))
+        assert_raises_rpc_error(-26, rpc_error(**MINIMALPUSH_ERROR),
+                                node.sendrawtransaction, ToHex(nonminimaltx_3))
+
+        self.log.info(
+            "Sending rejected transactions via net (no banning)")
+        self.check_for_no_ban_on_rejected_tx(
+            nonminimaltx, **MINIMALPUSH_ERROR)
+        self.check_for_no_ban_on_rejected_tx(
+            nonminimaltx_2, **MINIMALPUSH_ERROR)
+        self.check_for_no_ban_on_rejected_tx(
+            nonminimaltx_3, **MINIMALPUSH_ERROR)
+
+        assert_equal(node.getrawmempool(), [])
+
+        self.log.info("Successfully mine nonstandard transaction")
+        tip = self.build_block(tip, [nonminimaltx])
+        node.p2p.send_blocks_and_test([tip], node)
+
+        # Activation tests
+
+        self.log.info("Approach to just before upgrade activation")
+        # Move our clock to the uprade time so we will accept such future-timestamped blocks.
+        node.setmocktime(GRAVITON_START_TIME)
+        # Mine six blocks with timestamp starting at GRAVITON_START_TIME-1
+        blocks = []
+        for i in range(-1, 5):
+            tip = self.build_block(tip, nTime=GRAVITON_START_TIME + i)
+            blocks.append(tip)
+        node.p2p.send_blocks_and_test(blocks, node)
+        assert_equal(node.getblockchaininfo()[
+                     'mediantime'], GRAVITON_START_TIME - 1)
+
+        self.log.info(
+            "Mine the activation block itself, including a minimaldata violation at the last possible moment")
+        tip = self.build_block(tip, [nonminimaltx_2])
+        node.p2p.send_blocks_and_test([tip], node)
+
+        self.log.info("We have activated!")
+        assert_equal(node.getblockchaininfo()[
+                     'mediantime'], GRAVITON_START_TIME)
+
+        self.log.info(
+            "Trying to mine a minimaldata violation, but we are just barely too late")
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [nonminimaltx_3]), **BADINPUTS_ERROR)
+        self.log.info(
+            "If we try to submit it by mempool or RPC we still aren't banned")
+        assert_raises_rpc_error(-26, rpc_error(**MINIMALPUSH_ERROR),
+                                node.sendrawtransaction, ToHex(nonminimaltx_3))
+        self.check_for_no_ban_on_rejected_tx(
+            nonminimaltx_3, **MINIMALPUSH_ERROR)
+
+        self.log.info("Mine a normal block")
+        tip = self.build_block(tip)
+        node.p2p.send_blocks_and_test([tip], node)
+
+
+if __name__ == '__main__':
+    SchnorrTest().main()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-p2p-compactblocks.py bitcoinabc-0.19.12-uahf/test/functional/abc-p2p-compactblocks.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-p2p-compactblocks.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-p2p-compactblocks.py	2019-08-16 12:22:08.000000000 +0000
@@ -52,8 +52,8 @@
         self.n = n  # the output we're spending
 
 
-# TestNode: A peer we use to send messages to bitcoind, and store responses.
-class TestNode(P2PInterface):
+# TestP2PConn: A peer we use to send messages to bitcoind, and store responses.
+class TestP2PConn(P2PInterface):
 
     def __init__(self):
         self.last_sendcmpct = None
@@ -169,7 +169,6 @@
             # Make it the same format as transaction added for padding and save the size.
             # It's missing the padding output, so we add a constant to account for it.
             tx.rehash()
-            base_tx_size = len(tx.serialize()) + 18
 
             # If a specific script is required, add it.
             if script != None:
@@ -312,7 +311,7 @@
 
         # Add the new connection
         node = self.nodes[0]
-        node.add_p2p_connection(TestNode())
+        node.add_p2p_connection(TestP2PConn())
 
         # Reconnect TestManager nodes
         self.test.add_all_connections(self.nodes)
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-replay-protection.py bitcoinabc-0.19.12-uahf/test/functional/abc-replay-protection.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-replay-protection.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-replay-protection.py	2019-08-16 12:22:08.000000000 +0000
@@ -298,7 +298,7 @@
         assert(replay_tx1_id in set(node.getrawmempool()))
 
         # They also can also be mined
-        b5 = block(5)
+        block(5)
         update_block(5, replay_txns)
         yield accepted()
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-schnorrmultisig-activation.py bitcoinabc-0.19.12-uahf/test/functional/abc-schnorrmultisig-activation.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-schnorrmultisig-activation.py	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-schnorrmultisig-activation.py	2019-08-16 12:22:08.000000000 +0000
@@ -0,0 +1,393 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Bitcoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""
+This tests the activation of the upgraded CHECKMULTISIG mode that uses
+Schnorr transaction signatures and repurposes the dummy element to indicate
+which signatures are being checked.
+- acceptance both in mempool and blocks.
+- check non-banning for peers who send invalid txns that would have been valid
+on the other side of the upgrade.
+- check banning of peers for some fully-invalid transactions.
+
+Derived from abc-schnorr.py
+"""
+
+from test_framework.blocktools import (
+    create_block,
+    create_coinbase,
+    create_transaction,
+    make_conform_to_ctor,
+)
+from test_framework.key import CECKey
+from test_framework.messages import (
+    CBlock,
+    COutPoint,
+    CTransaction,
+    CTxIn,
+    CTxOut,
+    FromHex,
+    ToHex,
+)
+from test_framework.mininode import (
+    network_thread_join,
+    network_thread_start,
+    P2PDataStore,
+)
+from test_framework import schnorr
+from test_framework.script import (
+    CScript,
+    OP_0,
+    OP_1,
+    OP_CHECKMULTISIG,
+    OP_TRUE,
+    SIGHASH_ALL,
+    SIGHASH_FORKID,
+    SignatureHashForkId,
+)
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, assert_raises_rpc_error
+
+# the upgrade activation time, which we artificially set far into the future
+GRAVITON_START_TIME = 2000000000
+
+# If we don't do this, autoreplay protection will activate before graviton and
+# all our sigs will mysteriously fail.
+REPLAY_PROTECTION_START_TIME = GRAVITON_START_TIME * 2
+
+
+# Before the upgrade, Schnorr checkmultisig is rejected but forgiven if it would have been valid after the upgrade.
+PREUPGRADE_SCHNORR_MULTISIG_ERROR = dict(reject_code=16,
+                                         reject_reason=b'upgrade-conditional-script-failure (Signature cannot be 65 bytes in CHECKMULTISIG)')
+
+# Before the upgrade, ECDSA checkmultisig with non-null dummy are rejected with a non-mandatory error.
+PREUPGRADE_ECDSA_NULLDUMMY_ERROR = dict(reject_code=64,
+                                        reject_reason=b'non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero)')
+# After the upgrade, ECDSA checkmultisig with non-null dummy are invalid since the new mode refuses ECDSA, but still do not result in ban.
+POSTUPGRADE_ECDSA_NULLDUMMY_ERROR = dict(reject_code=16,
+                                         reject_reason=b'upgrade-conditional-script-failure (Only Schnorr signatures allowed in this operation)')
+
+# A mandatory (bannable) error occurs when people pass Schnorr signatures into legacy OP_CHECKMULTISIG; this is the case on both sides of the upgrade.
+SCHNORR_LEGACY_MULTISIG_ERROR = dict(reject_code=16,
+                                     reject_reason=b'mandatory-script-verify-flag-failed (Signature cannot be 65 bytes in CHECKMULTISIG)')
+
+# Blocks with invalid scripts give this error:
+BADINPUTS_ERROR = dict(reject_code=16,
+                       reject_reason=b'blk-bad-inputs')
+
+
+def rpc_error(*, reject_code, reject_reason):
+    # RPC indicates rejected items in a slightly different way than p2p.
+    return '{:s} (code {:d})'.format(reject_reason.decode(), reject_code)
+
+
+# This 64-byte signature is used to test exclusion & banning according to
+# the above error messages.
+# Tests of real 64 byte ECDSA signatures can be found in script_tests.
+sig64 = b'\0'*64
+
+
+class SchnorrTest(BitcoinTestFramework):
+
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.block_heights = {}
+        self.extra_args = [["-gravitonactivationtime={}".format(
+            GRAVITON_START_TIME),
+            "-replayprotectionactivationtime={}".format(
+            REPLAY_PROTECTION_START_TIME)]]
+
+    def bootstrap_p2p(self, *, num_connections=1):
+        """Add a P2P connection to the node.
+
+        Helper to connect and wait for version handshake."""
+        for _ in range(num_connections):
+            self.nodes[0].add_p2p_connection(P2PDataStore())
+        network_thread_start()
+        self.nodes[0].p2p.wait_for_verack()
+
+    def reconnect_p2p(self, **kwargs):
+        """Tear down and bootstrap the P2P connection to the node.
+
+        The node gets disconnected several times in this test. This helper
+        method reconnects the p2p and restarts the network thread."""
+        self.nodes[0].disconnect_p2ps()
+        network_thread_join()
+        self.bootstrap_p2p(**kwargs)
+
+    def getbestblock(self, node):
+        """Get the best block. Register its height so we can use build_block."""
+        block_height = node.getblockcount()
+        blockhash = node.getblockhash(block_height)
+        block = FromHex(CBlock(), node.getblock(blockhash, 0))
+        block.calc_sha256()
+        self.block_heights[block.sha256] = block_height
+        return block
+
+    def build_block(self, parent, transactions=(), nTime=None):
+        """Make a new block with an OP_1 coinbase output.
+
+        Requires parent to have its height registered."""
+        parent.calc_sha256()
+        block_height = self.block_heights[parent.sha256] + 1
+        block_time = (parent.nTime + 1) if nTime is None else nTime
+
+        block = create_block(
+            parent.sha256, create_coinbase(block_height), block_time)
+        block.vtx.extend(transactions)
+        make_conform_to_ctor(block)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.solve()
+        self.block_heights[block.sha256] = block_height
+        return block
+
+    def check_for_ban_on_rejected_tx(self, tx, reject_code=None, reject_reason=None):
+        """Check we are disconnected when sending a txn that the node rejects.
+
+        (Can't actually get banned, since bitcoind won't ban local peers.)"""
+        self.nodes[0].p2p.send_txs_and_test(
+            [tx], self.nodes[0], success=False, expect_disconnect=True, reject_code=reject_code, reject_reason=reject_reason)
+        self.reconnect_p2p()
+
+    def check_for_no_ban_on_rejected_tx(self, tx, reject_code, reject_reason):
+        """Check we are not disconnected when sending a txn that the node rejects."""
+        self.nodes[0].p2p.send_txs_and_test(
+            [tx], self.nodes[0], success=False, reject_code=reject_code, reject_reason=reject_reason)
+
+    def check_for_ban_on_rejected_block(self, block, reject_code=None, reject_reason=None):
+        """Check we are disconnected when sending a block that the node rejects.
+
+        (Can't actually get banned, since bitcoind won't ban local peers.)"""
+        self.nodes[0].p2p.send_blocks_and_test(
+            [block], self.nodes[0], success=False, reject_code=reject_code, reject_reason=reject_reason)
+        self.nodes[0].p2p.wait_for_disconnect()
+        self.reconnect_p2p()
+
+    def run_test(self):
+        node, = self.nodes
+
+        self.bootstrap_p2p()
+
+        tip = self.getbestblock(node)
+
+        self.log.info("Create some blocks with OP_1 coinbase for spending.")
+        blocks = []
+        for _ in range(10):
+            tip = self.build_block(tip)
+            blocks.append(tip)
+        node.p2p.send_blocks_and_test(blocks, node, success=True)
+        spendable_outputs = [block.vtx[0] for block in blocks]
+
+        self.log.info("Mature the blocks and get out of IBD.")
+        node.generate(100)
+
+        tip = self.getbestblock(node)
+
+        self.log.info("Setting up spends to test and mining the fundings.")
+        fundings = []
+
+        # Generate a key pair
+        privkeybytes = b"Schnorr!" * 4
+        private_key = CECKey()
+        private_key.set_secretbytes(privkeybytes)
+        # get uncompressed public key serialization
+        public_key = private_key.get_pubkey()
+
+        def create_fund_and_spend_tx(dummy=OP_0, sigtype='ecdsa'):
+            spendfrom = spendable_outputs.pop()
+
+            script = CScript([OP_1, public_key, OP_1, OP_CHECKMULTISIG])
+
+            value = spendfrom.vout[0].nValue
+
+            # Fund transaction
+            txfund = create_transaction(spendfrom, 0, b'', value, script)
+            txfund.rehash()
+            fundings.append(txfund)
+
+            # Spend transaction
+            txspend = CTransaction()
+            txspend.vout.append(
+                CTxOut(value-1000, CScript([OP_TRUE])))
+            txspend.vin.append(
+                CTxIn(COutPoint(txfund.sha256, 0), b''))
+
+            # Sign the transaction
+            sighashtype = SIGHASH_ALL | SIGHASH_FORKID
+            hashbyte = bytes([sighashtype & 0xff])
+            sighash = SignatureHashForkId(
+                script, txspend, 0, sighashtype, value)
+            if sigtype == 'schnorr':
+                txsig = schnorr.sign(privkeybytes, sighash) + hashbyte
+            elif sigtype == 'ecdsa':
+                txsig = private_key.sign(sighash) + hashbyte
+            txspend.vin[0].scriptSig = CScript([dummy, txsig])
+            txspend.rehash()
+
+            return txspend
+
+        # two of these transactions, which are valid both before and after upgrade.
+        ecdsa0tx = create_fund_and_spend_tx(OP_0, 'ecdsa')
+        ecdsa0tx_2 = create_fund_and_spend_tx(OP_0, 'ecdsa')
+
+        # two of these, which are nonstandard before upgrade and invalid after.
+        ecdsa1tx = create_fund_and_spend_tx(OP_1, 'ecdsa')
+        ecdsa1tx_2 = create_fund_and_spend_tx(OP_1, 'ecdsa')
+
+        # this one is always invalid.
+        schnorr0tx = create_fund_and_spend_tx(OP_0, 'schnorr')
+
+        # this one is only going to be valid after the upgrade.
+        schnorr1tx = create_fund_and_spend_tx(OP_1, 'schnorr')
+
+        tip = self.build_block(tip, fundings)
+        node.p2p.send_blocks_and_test([tip], node)
+
+        self.log.info("Start preupgrade tests")
+
+        self.log.info("Sending rejected transactions via RPC")
+        assert_raises_rpc_error(-26, rpc_error(**PREUPGRADE_ECDSA_NULLDUMMY_ERROR),
+                                node.sendrawtransaction, ToHex(ecdsa1tx))
+        assert_raises_rpc_error(-26, rpc_error(**SCHNORR_LEGACY_MULTISIG_ERROR),
+                                node.sendrawtransaction, ToHex(schnorr0tx))
+        assert_raises_rpc_error(-26, rpc_error(**PREUPGRADE_SCHNORR_MULTISIG_ERROR),
+                                node.sendrawtransaction, ToHex(schnorr1tx))
+
+        self.log.info(
+            "Sending rejected transactions via net (banning depending on situation)")
+        self.check_for_no_ban_on_rejected_tx(
+            ecdsa1tx, **PREUPGRADE_ECDSA_NULLDUMMY_ERROR)
+        self.check_for_ban_on_rejected_tx(
+            schnorr0tx, **SCHNORR_LEGACY_MULTISIG_ERROR)
+        self.check_for_no_ban_on_rejected_tx(
+            schnorr1tx, **PREUPGRADE_SCHNORR_MULTISIG_ERROR)
+
+        self.log.info(
+            "Sending invalid transactions in blocks (and get banned!)")
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [schnorr0tx]), **BADINPUTS_ERROR)
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [schnorr1tx]), **BADINPUTS_ERROR)
+
+        self.log.info("Sending valid transaction via net, then mining it")
+        node.p2p.send_txs_and_test([ecdsa0tx], node)
+        assert_equal(node.getrawmempool(), [ecdsa0tx.hash])
+        tip = self.build_block(tip, [ecdsa0tx])
+        node.p2p.send_blocks_and_test([tip], node)
+        assert_equal(node.getrawmempool(), [])
+
+        # Activation tests
+
+        self.log.info("Approach to just before upgrade activation")
+        # Move our clock to the uprade time so we will accept such future-timestamped blocks.
+        node.setmocktime(GRAVITON_START_TIME)
+        # Mine six blocks with timestamp starting at GRAVITON_START_TIME-1
+        blocks = []
+        for i in range(-1, 5):
+            tip = self.build_block(tip, nTime=GRAVITON_START_TIME + i)
+            blocks.append(tip)
+        node.p2p.send_blocks_and_test(blocks, node)
+        assert_equal(node.getblockchaininfo()[
+                     'mediantime'], GRAVITON_START_TIME - 1)
+
+        self.log.info(
+            "The next block will activate, but the activation block itself must follow old rules")
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [schnorr0tx]), **BADINPUTS_ERROR)
+
+        self.log.info(
+            "Send a lecacy ECDSA multisig into mempool, we will check after upgrade to make sure it didn't get cleaned out unnecessarily.")
+        node.p2p.send_txs_and_test([ecdsa0tx_2], node)
+        assert_equal(node.getrawmempool(), [ecdsa0tx_2.hash])
+
+        # save this tip for later
+        preupgrade_block = tip
+
+        self.log.info(
+            "Mine the activation block itself, including a legacy nulldummy violation at the last possible moment")
+        tip = self.build_block(tip, [ecdsa1tx])
+        node.p2p.send_blocks_and_test([tip], node)
+
+        self.log.info("We have activated!")
+        assert_equal(node.getblockchaininfo()[
+                     'mediantime'], GRAVITON_START_TIME)
+        assert_equal(node.getrawmempool(), [ecdsa0tx_2.hash])
+
+        # save this tip for later
+        upgrade_block = tip
+
+        self.log.info(
+            "Trying to mine a legacy nulldummy violation, but we are just barely too late")
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [ecdsa1tx_2]), **BADINPUTS_ERROR)
+        self.log.info(
+            "If we try to submit it by mempool or RPC, the error code has changed but we still aren't banned")
+        assert_raises_rpc_error(-26, rpc_error(**POSTUPGRADE_ECDSA_NULLDUMMY_ERROR),
+                                node.sendrawtransaction, ToHex(ecdsa1tx_2))
+        self.check_for_no_ban_on_rejected_tx(
+            ecdsa1tx_2, **POSTUPGRADE_ECDSA_NULLDUMMY_ERROR)
+
+        self.log.info(
+            "Submitting a new Schnorr-multisig via net, and mining it in a block")
+        node.p2p.send_txs_and_test([schnorr1tx], node)
+        assert_equal(set(node.getrawmempool()), {
+                     ecdsa0tx_2.hash, schnorr1tx.hash})
+        tip = self.build_block(tip, [schnorr1tx])
+        node.p2p.send_blocks_and_test([tip], node)
+
+        # save this tip for later
+        postupgrade_block = tip
+
+        self.log.info(
+            "That legacy ECDSA multisig is still in mempool, let's mine it")
+        assert_equal(node.getrawmempool(), [ecdsa0tx_2.hash])
+        tip = self.build_block(tip, [ecdsa0tx_2])
+        node.p2p.send_blocks_and_test([tip], node)
+        assert_equal(node.getrawmempool(), [])
+
+        self.log.info(
+            "Trying Schnorr in legacy multisig remains invalid and banworthy as ever")
+        self.check_for_ban_on_rejected_tx(
+            schnorr0tx, **SCHNORR_LEGACY_MULTISIG_ERROR)
+        self.check_for_ban_on_rejected_block(
+            self.build_block(tip, [schnorr0tx]), **BADINPUTS_ERROR)
+
+        # Deactivation tests
+
+        self.log.info(
+            "Invalidating the post-upgrade blocks returns the transactions to mempool")
+        node.invalidateblock(postupgrade_block.hash)
+        assert_equal(set(node.getrawmempool()), {
+                     ecdsa0tx_2.hash, schnorr1tx.hash})
+        self.log.info(
+            "Invalidating the upgrade block evicts the transactions valid only after upgrade")
+        node.invalidateblock(upgrade_block.hash)
+        assert_equal(set(node.getrawmempool()), {ecdsa0tx_2.hash})
+
+        self.log.info("Return to our tip")
+        node.reconsiderblock(upgrade_block.hash)
+        node.reconsiderblock(postupgrade_block.hash)
+        assert_equal(node.getbestblockhash(), tip.hash)
+        assert_equal(node.getrawmempool(), [])
+
+        self.log.info(
+            "Create an empty-block reorg that forks from pre-upgrade")
+        tip = preupgrade_block
+        blocks = []
+        for _ in range(10):
+            tip = self.build_block(tip)
+            blocks.append(tip)
+        node.p2p.send_blocks_and_test(blocks, node)
+
+        self.log.info("Transactions from orphaned blocks are sent into mempool ready to be mined again, including upgrade-dependent ones even though the fork deactivated and reactivated the upgrade.")
+        assert_equal(set(node.getrawmempool()), {
+                     ecdsa0tx_2.hash, schnorr1tx.hash})
+        node.generate(1)
+        tip = self.getbestblock(node)
+        assert set(tx.rehash() for tx in tip.vtx).issuperset(
+            {ecdsa0tx_2.hash, schnorr1tx.hash})
+
+
+if __name__ == '__main__':
+    SchnorrTest().main()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/abc-segwit-recovery.py bitcoinabc-0.19.12-uahf/test/functional/abc-segwit-recovery.py
--- bitcoinabc-0.19.11-uahf/test/functional/abc-segwit-recovery.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/abc-segwit-recovery.py	2019-08-16 12:22:08.000000000 +0000
@@ -254,7 +254,7 @@
 
         # Mine txfund, as it can't go into node_std mempool because it's
         # nonstandard.
-        b = block(5555)
+        block(5555)
         update_block(5555, [txfund, txfund_case0])
         accepted(node_nonstd)
 
@@ -285,7 +285,7 @@
 
         # Blocks containing segwit spending txns are accepted in both nodes.
         block(5)
-        postforkblock = update_block(5, [txspend, txspend_case0])
+        update_block(5, [txspend, txspend_case0])
         accepted(node_nonstd)
         sync_blocks(self.nodes)
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/combine_logs.py bitcoinabc-0.19.12-uahf/test/functional/combine_logs.py
--- bitcoinabc-0.19.11-uahf/test/functional/combine_logs.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/combine_logs.py	2019-08-16 12:22:08.000000000 +0000
@@ -69,7 +69,7 @@
     Log events may be split over multiple lines. We use the timestamp
     regex match as the marker for a new log event."""
     try:
-        with open(logfile, 'r') as infile:
+        with open(logfile, 'r', encoding='utf-8') as infile:
             event = ''
             timestamp = ''
             for line in infile:
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/data/rpc_getblockstats.json bitcoinabc-0.19.12-uahf/test/functional/data/rpc_getblockstats.json
--- bitcoinabc-0.19.11-uahf/test/functional/data/rpc_getblockstats.json	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/data/rpc_getblockstats.json	2019-08-16 12:22:08.000000000 +0000
@@ -0,0 +1,192 @@
+{
+  "blocks": [
+    "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4adae5494dffff7f20020000000101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000",
+    "0000002006226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f603cceb3f73a7cb716e4302f895f710a6b2009fef95644e20bb63d48f5036c95fcae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c510101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a1b229d0834168737317fe9ff3f0efe41d0c1cf497610fa249f8f75fd3546a43ab6fdeb894ce3c54fb7cfc92eaac87c7dfd6cc9e62924c6c27f90b5b20c8e27cfdae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c520101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c0297229e84d3293c968f2d6bda4910b618213d600950beef17e0a31300038279050e9a2ab8e3f8760a0c710f620f3782285ddbccc30d1052d85ded7e91f2e90fdae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c530101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020d2b56df3df41975d8d86daf76328e439a5742714b03f036107d33ef02fc5910b967da0754ee860c100650b978c4631c2475e08201fb419c168fe75430d9537e0feae3e5dffff7f20070000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c540101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000203b69e1a46ccec282ecee3d3fa7caf445b6af44cb835ee364fefe55e1568c4e03ec4689bb7de3436a6699ee6131891732d24dd50c9d10c4b710092b3c6f42dd94feae3e5dffff7f20040000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c550101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a0740a8851ecf8dee724c1439ae1e41d36662dfee647e63273bc4b712e547c72d9d1f74c610fc82c269e1f745c76b856929ce97b3c742d9f20684e4db7af80affeae3e5dffff7f20040000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c560101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000207584e34d22e29fdbaf41dd4e008c9e8484333fa388ae435ecbeb5c0ee7055f1328650c6f963f174375b9d58a00590b65e610ffa330b60f297977c8f7d4f7ae75feae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c570101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020e0ca49a7e455619f042730864472e0fdd56fe50a93a442f8771f34b74b9c23164e2d203ec788a7e63305b013a158534c0256122aa11a365bc82d2cd5d48a96c1ffae3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c580101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000207cb695ce37dbc0304bcc3de4a48af1592d214c12ebdfeba3a93226a46ef3e4625267144e15c69054189790a40115c5ad8e2bcfbce5ad35c9716cd622d0a22d5dffae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c590101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020418601965e3425639211ed9bfe548b64032e04b4a09d8678ab364b3c12432b0273f7cfa05ba9dc5d7b2912c468064bad58fa5d1361940019f770ad7d935a612dffae3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002090fa44e5eeb49c033ca107b06b5fb4b3f4853d1e8c9eda085220555948387053bb908de4cd1a4dd37cc55673a9c83d7620dbd54e3866e1986df94e5bb0a32422ffae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020651531451f950cb180c42268ae52ff12f5468bc8d253fb62dc787713786fca564a5ffab27e2315cc6a400b374e8859aaa67de3bc880706bf28a022bf90e2720affae3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000206826a66b525bd3582b6ecd6d41c3552b5b960469360abae55816e005d4572f2610f7de6913bd1d6754a0ff66c9c25cfc23e66700692a394c4a166901393f594bffae3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002031d35234484e6d7be919ffac7f25178166a44de3be0042d6975dd4d921c346171172d6a79b19626f7644210aba0980ecb809217cbd852ae29a004a601783d6ea00af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a994e380dd10ad4f5f9545d70708671dad34fee1adfe3751d7117f47daebba78b039ea59f25f30a2919c6adc330fb4837d506a4739c01f9e200cfb6509f4d77000af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c5f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020f354eda57d1fe7c4121dae09860a8aa1d876407f66b4d8eb6ba9b51abf31486eb77513d1e03f55b26c68bead3b704dde6d81e7b7eac8fa9beb3c9f23741e759e00af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0c600101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020855596948e4de375893215035b18ecbdd5046e78180e3a6ccd056e1e12e3a16766b6230d60ead56152fbb95ea4bb7ebeedcf288f316ed4dba6b9feab48b72e9200af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01110101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000201470dada492622a488ef6edae8578b2695f1698624fa68b5460cb59614f1f44bc86baaf5c9997b519d43d54e4d174636319f62866367182fb658d4e677f1c6c100af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01120101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a9d11fde6a53b9a4fdeea3e1b7f7bd0563a65fd4f64ffaba5e3610c8ee29fe34d2ba93b50005955fa9b39460321714e402b49f8777d23039d0fea549ecb8ddf200af3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01130101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a86cfbb128c3b3765f9770feb1de972ec41791cc6053fa029d1b4e50daa0bc59e5e2c8e3ba67ddff5e818e6f06422a2c980d9ce319c8960417e3f1c7460d27d001af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01140101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c93d352c71a40dedcfd961345f979a41bae03d5d576e2448e35679e83e8c286e1af45f68f16fcd03b4afd878000e6e85c87c29fe96b2ed4867faa0067a58a5f901af3e5dffff7f20040000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01150101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020bdfc271ed953f1f97f1905741deaaf71002f6de64dc32556cbb64b4685920a7b36191e3cc96a5f302572e79d0dda9a684ca1df3456dcc878e4773216f2556ecc01af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01160101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020476f64499f6587927bca14bba4aba5a9bd26edc719a4a82581aadf4382028358aac04b5f98111371bd8658dfb169896073887301109189bbcbfbded7ac6bf32101af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01170101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020edf57cdeaedac8d3bd8e30e9dcb160e7af86f4f90c22bcc8628fb72b40711c25d0e8c1dc01bdcb406871341e25adaeb4c0204ad663c3f046ab05a447050dab9c01af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01180101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002074d0959b9657e7e374b459098fbcec42e0688ab9b0378bc94db84700e59d3d111d5ffb2f99d664ecfe4a19def8ca04538a3eba542ce1d9298cb652ac5325946101af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01190101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002032a35987a9168e265faaf16719c2ab0178409c8e988c2c9aed70398dfe6c230e4c8f78b6dbabf44263584964dc6d7ab8b0c081e15c6b66d0639ac621df4203da02af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c54ea8853336e632c7ecb2217a05c0cb592c7a6e0259d576721279b06f66626f69d46667c0ed1f4a61f89b8089c4a3bded1e09c85a9c1024292034df3dda22cc02af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020bda7868d270391d11a4a5c9b2893b38e432139a14a91cc17570bd369d1cd884e8617ca924c9fdcbe394013624561643f06263b0f0e3154f19c439b41ef5c3afe02af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000207318476fa8aec77230058f12eeaa4173dfe172a6d96a18ea72c26f181ca73714159c3f4eda97aea3b6476376b534924f169ac0616b8e7498a7ebf8ddc2180cda02af3e5dffff7f20050000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020f69c2d1d16250b2e2fe15487ccfec5582829dec777ed814d11a982657b73154fcced0eeb3971e928a56409f5bd4599b138e9150c967218c45574cca7314d0c9702af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020097d6d6130e29141f998ec0f75e6b9081cca2c58f77a1c3457e7ef388aa4031621cc9d5d3e1785861d1186d6e2b98d0363a7e701015329f1095d4e464b16dda302af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d011f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020e0e30aa7f9945104a945693ffb06d99a47e873b5d3b89358c6c5b35629c91572afb1dab9d7d56d72929092ca5ffcedf54eca070e4a1ee4beb13d7844b687d00b03af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01200101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a085d816d1a386a7a14ea593fcc10c80c3002288f34353d3b29886cb0cea5d4756d6bfebbefbc8f231673723c984e8bf3fab45bc4ce2cb97fcfba23d8a5e019303af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01210101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020276bf02315887fcc3239ab4742e369576a2f5647d77df8458dc986fa67ae866c8c3b44989f7cfa98b4bd70140a6dfe62d1e08e6040fd9c7f2101faf0a38182d803af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01220101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000207f8d7f3ccdc937fa831d5a07d04d125729a19736f33202490a29a5da070cf875071b4606ca7a80ca328ee8aaf73dde99773064c472c6113d2ecb78ddd9ecaf7e03af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01230101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c0a51fa5f78e617a2b152e99a717c626ef4205ba27d40bea84e1da7354a9b11f1ea1f19ed0b86389be7a3cf84250ae4fea638a1b9b4c5d1f7fc8d02772ef538603af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01240101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000207c6aed7461f11b2e477dec1f71901e31a9b29da50c962b6492432be85866ec6b3a4ca3ac0aec68ada03f4792c99c6101dc7e28f7dd75e92cd34cf61048d0d56003af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01250101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020987b8c1fa17d09b669ae442161f2ead6e331b31f16df30a31c40ed99c0bc2c30e270fe0f6243ea281807d2d86429d99fa3811b83d0327a9cb92ec83e2920254704af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01260101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020ac0c66e32febed120d210b00c7bc4ca8837d7daf6528a95fd2700bceba45af5363433fde0a86bddc7a73b0ad33dc3795d7b13954eac3a7c9ce3a27b5b8b2b63404af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01270101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020b6ab687d84bf442827a095a0249ed885fa8ba80ad07f8b85519ffd246393e6772c126fe79be273718947e4f8d84b23cb00a749e894a47cba2a0770c35138572304af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01280101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020818c86781f0995cbaf913511877b0a56063fc0daf38dfc35df9e7b915c7774777d5cd38b5947ed0d5e692e46511dcce1c090d00d06c57999e8154243774c834204af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01290101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020ce09a60de8ea5c4ef0e3a978cc8e2a6f6553f9b0d497f45cace6fcbcb786d50c110ed1bd88bb25662f0d37edad65281cd0290ee453d759ddcfa2abd8281af7d104af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020e69da75c4d9de0ca885628346dc881049a621e54e4ba9c7f9b28a8d30267f915aa7e32793f0c10634104ae16cb141d33a8011ccfc1372a78bc12dd559f09453b04af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020f04b6a02552122418368fbbe2ff06c53e645d9c23c032a995e5053082b49317bbbc8dfe78d06ec8b45ce5bd73b12b14541bd8ce8aaeb776c211fb60899d10d7f05af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002033554aac61ef01e6707e094a98aeeaed6055a24724c6dc8ade13f8e410b5e267017e91213401d2c85b25a3bcf5c4892abd5fdd05e9a1c88c7db506c51b0e797705af3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000203dd7328a391034ead240eb7b9fc9923c0dde4b30b7ab746b90f714d2f9f08541f6a697c4ed25ace6ea1de91d8725c15c7e6aee76aa3dde83036cc5e35bbb2fe505af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000205069b1555baa6f2a77e49fd6ae8cc92f2475730dc459e78d83ae91b053882f56ca7be94fe40621eb884d23e6c2cc5b1e47c9c7cdfc639790de1c8d8bdb7efecb05af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d012f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002045550e1e44685f5427f69a26e756dcc005b989125af1926926dc294167b45f77374ccc6868031ca1a32101281499c42f99bec2201aed1510b3d8b265ba73431405af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01300101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000209d6750f3ee1cb6dc08ee43bfe3e298af1a11b4709ba8060760a5601051af7503ef931bc5001f30d9ed4765cc11f32ccf650b0b0a9d219636db708b5a097b987905af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01310101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002041c64d1b85786976dd5ccb17c6765ca984d835551bbd2004b463af7e7638ff6ea14c87ebfed298d3aead8270010514a2e2f154ee18d9bd51130495f3cd3a2ed006af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01320101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020059d10e3d50555f7d03af6aac0d0dd637267d6645f29be7e829d7c4203402a4da1dbb136439c9317da2a9d22e702cdcfecf9eab2d83c61a18c421028fa07082406af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01330101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020249400878c5c819db559818f8c642bec2f10b05f1da22c4dc24a0aaa848527516782b0d42714f44634ed90b40adb4ce2afbfac8ed14624451edc8274eb9bf0ea06af3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01340101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020fa6163908cce50019a5dd137c7e36d4e1f46a2022718b9469ac46c0f42fd81191348316f65b142316320ad1a81db800c6a54909a8908d9ec295c37f70beeae0006af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01350101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020f660ccf491edca33073f344294d6c549892023a0ebca3ce100f51b16e896422a7837fed416d6b40fcdd075f92abb299e5dc3027beb2dc7bfc03d24ba1d3131d506af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01360101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020623d3c27c5731c7849ef02c09338ae09ebaca8b01fb82ee5964b74e42a8c8b1263ffe0292f0007bca9935fde929dc33d2cb2343dd6eec1eab0d3c9285370bdd306af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01370101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000208fec0aec0998dff808aa61e894365330eb33e02bd68db039c97347ed10f0cf4844608d0fcd3103dbfcba35e45f102c5b6a165f107530a1dee57ebb61a8127a4607af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01380101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020273ea732b1bdc7e5d1a27886d5622998340d7f75207019aedd9f2857e7b2091f66aff85a92fafdfb7701d37e95e61ca850b1ac8d83aa0098ebeaddba4b012f5707af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01390101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002095fb442987762ffb75ac53bcae5a482a9b16f29688fc53b142a8c80e9547030cfeea96c15d21fe07642e0bc3fb1f8f7f7e3aba7c564ee5ebef31ad74bace945907af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000204ff62d8d1e0f292a018033f62118b6b2080a5cab3e6b495c1cc71ce4af760f532eb882e77b224e4f2981beed7a93deb83e298265de1cf6bea13f690449c64c2f07af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000209a8b436302e4a835343f361a176e476f08ffd2be395a1350cc82875dd9f8ee7bdb7d8c159fc0e28c29b3c78d84b014b6972c92e0a5c4c400c2db3cd78779b5db07af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020458604d5245623305c1c95f2a6c1481c37e231f55c7feb09fe4af6edc3363a6c26a70fb186c1c53925d320ea5a9f91a5a45c34addba482a1257b9707180787e707af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002078a40d9067dc1df5a9ff2c56c7b68a1fb5ccd36db5da6064c8ffd190f0e78a719744c49f321dc7555bdf93a530fcfedf0a2aea297239d9762983d35961eca23608af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002081926763bf50d959b4f4446ee6a36fd08a7799909f0965c64ed7fe2140ae6779d75e4e454436c5812b8b50d26ec3999d45f5ba4f5e7443dd6c93e3e598e48e8708af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d013f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020ee27509923a5b34397e3d08b838cce5da3f8284b864cf0f112b2469f796f8f1801a8f1d361985f3f268f559c99e0569c31c9a749aecb5bf2f7fb32889277650e08af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01400101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020d0393ff8b46d4dfff2cb8cbc52a234621aa2315e72b73fbee3800049c5428f5ce9b50d7487eade308183111a83d777012a76e9ba30edcd6c57b4b5e82809553c08af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01410101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020f8928685487b724f55b9eed6881008278a193e8695dbbde23587d5f2290cbb5ae7326c8f208a5cfbe42b1f17588723b6d87f6dcd8bc814072385b6ee059c57fb08af3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01420101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002052dfdc3eee69bee8117e6ab324732911a926c4b0f50c0ba1270bfd5ec7eae542b772c98d599e12e0d31f0b6325231a51903d96253f2ffd36d825688beb56427008af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01430101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a1682451d6e1dc07bc2787adcef3d0b54b01cf6e432795f7fe18c75476086b1af5dfb599b10e717ff51d1e452b7d81b95ee12966e45d121af3db3b7fdce39f2709af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01440101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002082621dd9b93a0527284715890d24d708c74735caa3911e2a0f24e3216ca4b22435d76890d30dc74ca01dddbf7089ce454a450b9464e18cd2ef57ab1547f1e40509af3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01450101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000203979376e3aded23a1c4cf5a29d96032b48b2fe79d93e5e6e1b82ac0876aa441139365c37d902d88b55d101060926205ecf39eec853f66bed9f8960a38175e19a09af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01460101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020fbf88f12c278a9d31a86ac4db23ecba825e4e709797394503c03e28bb2d84f6ccd9a1ecf1fb78f0deae918d7c4cec69ec5a78cbe83bc4bf3a86007fcd49a726109af3e5dffff7f20050000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01470101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002072a64d5fa12d6c182306f20530763fd88f3c78f34e5d4f27548dae339bc62268d91604be34c8ed5184efbec2e557b39129eaf8b3a6af7fed37a079ab1475e7b909af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01480101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020852810fdb8342ea03b951e3c4091a61691a4e688373b4337bf9308d749e12a3b42914188016ba1a8f15929612069b466c18b7be84744139b45b7357f30d9be0c09af3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01490101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020a1865284d852819c7914834b454c6074232bc6149ff171a5e6d8018de77a0427ecbce092c74f607d3faeedc8cdb9d0a5e12486a0fd753298ed8c290c8e5a62e30aaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000203f1e33d80e8ad13503774c520c16e3f4cfa9c7fc8de890f27ab65762948a593a76fc9b9e2c1feb40040fb339343fc7ec75f224ee96cf64d0c3e74a19731df1d80aaf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002060bc0f141abc2c39cbd380c2a873bb19f994b15e9580328a5c973c9164e3cd0b8d1faf9419aef34ebba2aeaeacc251c6f72fc8cd984b043bd34c96cee67dd8740aaf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000200da8bab855e03905beffd3f5f80af62f2195c06904e2b473347a3813bd5a67437293b495ec0672a64e92098bad1fae5756dc66254d39937303c249dbd55bd79a0aaf3e5dffff7f20080000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000202020b33af211ab559011d5524645ec6cace7e6d421504240aff408443b380c5c844178adfe02bf625556489ba9fa032f955e48befa8372ac03fc78313f81f5ab0aaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002055de3e128847e9779444c37df254e27ae64848bd313f4387e521a69740a3b01b16b30c88655d6a2b28546234448abfc94b89725ceb3392f90a88bfe4231c9d280aaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d014f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c95ed1f70d46c6f50f077bb215aa64ca8481de181925d3d1f68b938ba7a9fb16a78c01a1be5d15fd56851fdbea5675852ee8b95612fdc0fb6d6404c9de79bbb80baf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01500101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002098cd6d077d5372be2db5b0dea6ae0e2f84f4cd0d58489350d8cfbf0622630113e2e450e87381fff2ff71c9e3f9de544ea5ae54d35813ee8932f1090aa4f656ce0baf3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01510101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020066518ec278e9720795132250943bc76af640bbd8dd9bd047673df5c91be326b5f25aff8cf477b20e3ebc97b58790312386d1876c3b1cd06ea505d2c401392dd0baf3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01520101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020180a1786670b80df30a9dff70eac9f98000957f10152dc34968697d066ea38059f5c8d21c629c16479339f18438c79b682718e706b8d3acf3263ad84aced86570baf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01530101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020cbf4860b6f881758f6d71dcfa810e5da38122e878c5b099bfa871ae81fd3e040596ceba5ee82b571f8f64061ca4d9022f7e6d9acb75457765b7013267acd1c340baf3e5dffff7f20040000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01540101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020d60983308cc045c477be39bd0faf65abaf9531efc3264c2f89403e6bda35d17886a727743ef5798dddca45ce0e3b78ec4a6a6ba4bbd4d71e2efebe029e63848f0baf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01550101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020e3da2c18cc8743d6f9b6fb671bec7de0be1f5b3addf524f54954962839f44a5c1481f4e1446f2e82bdad3fc56ba71fd85d90092be9d4b2ca2cb23cbc9278f1df0caf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01560101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000201690b43645707eacf0b90021e78ca06efb56e73cf88605dc16a99d48f95d6c64549d34adb3aa78c5a91f7b353303f9955ea3e707a8b569f31f8581514616c66f0caf3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01570101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000205ffa114b5d07ec73994e33574cf47a3849399ef0bcef5b3e28183c7809956b36cf98c852c8cb2780c149ee0b939a0a65005d55488127a45103c14694a27e04c00caf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01580101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000201e63eaa9f3f4352299d3365d87a67a2113aa1766f295d2c8aa75d90808cac20b3477ef9069accc89ff24aae58dfc0533c06790815d1ae497375598d2298639210caf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01590101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020077d1ec43ef98bfe8493d6241258d0c96a47fb57ba32d5300983732294e9dd4c31ae8e66eaf630acc8f92ab418c90dd63511dc6329bca92e455d189a5fa3da4d0caf3e5dffff7f20020000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015a0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020543d35799aa94a2811cf51f1cebe3c368ea1664591ccb5773d737f3ef455c6553f84fb2dce964710c2a967c969486280615d6a24c23e299cacb89248909936910caf3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015b0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002083d4badb13fead2214c5b9e80de4083472ba4a12f376d0efaf5c33d66218215ff50fa117390ec818dd4d01e39cf1243a77930d1d432284d44ad5665fed8ebdf90daf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015c0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020e40b8b1acae19f7778538c69ee0d6defc851f3737089289df88b90210307de1c0006f17f9e19d453d649f899ce60d805e7969c76a9a3896c9c635398f566eee50daf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015d0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000204105546a9150a7fda81f855f789dc7e74c449fd1e90452d8505a098d4d328b113dbd0b909fcb4d0bf698dde11bf868cbed62ba1d73025178abfaac737496cbcc0daf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015e0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020eafecc64b055e27f27c9970bed106ca394db15a7b37f2d10b686ee3161b5a039a2e190ac4ff4d92e71f3480f0486f8f8d19a5072546cc88b2d3ee0c4ae6e320b0daf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d015f0101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000203594cb0c8d6c44fcb3276245947ba08affaced26df41fe190c15e602d7d8b26b5854adc7c9168972e7948190e88a246b6b16689231337226890076a703b375220daf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01600101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020b8de96b624d05db102e4d00cb01e167e9562a1bfd38c2e1b4ca9f31e5e8f5f63d132cb86b30801682b7eb051b66156e07c7bc17f59288f7821698d836bb5f79c0daf3e5dffff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01610101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000202e6b1b2274f2343d8ba90516444633e802b18242750b8a466351e85ff0b62a67483769f2dca54c9d48ed4056e854d1e3f86e2a5470cbb2f54590f04f2909fe160eaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01620101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "0000002034a40347b6ac7c059eae4f7fc4cfdf8293170bcf7b9de7cbeb74a5596f23512c3e677d5d36d96494a8e5aa4e51c9ee584931edaeed45bb39f6e7cef8cc73b1440eaf3e5dffff7f20030000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01630101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "000000209b5ebe3f645d941812f524c5f195b5f4c202d5d85d893519bee812f6a45e8c3e9003ebe6f07138bd8b2ea87ab53daf97e59d36dbfd1bca923fc6ec5224e0bad80eaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01640101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020c97362443ee44a505c2d103ef639f9700e04098c374257fa7fde93d12edabe1fcc64a08492c6297a6de8163441eddfb4f930bb85771ed944370d9377ad16b7750eaf3e5dffff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01650101082f454233322e302fffffffff0100f2052a0100000023210295b3f2a34ce06d50236eb6cf6faf28b00e183b9ec8e08d4e86bcbd770780b98fac00000000",
+    "00000020926cae5c4df5b8bfa22a69deda736348bfac3105ae4de6183dcfc7f8cf2aa67803bda646a6b744182b820a12ff3cdb42c9c1706905d557e312e97ccda499f2970eaf3e5dffff7f20000000000202000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01660101082f454233322e302fffffffff01c0f2052a010000002321039d727b812c66518bc0eea6e3cbee143671320982e680114b7929e22ed0e90d2fac000000000200000001603cceb3f73a7cb716e4302f895f710a6b2009fef95644e20bb63d48f5036c9500000000484730440220775e2fc69304f0dad57d52f68a907743fff75e8b76a02e7c6f175a767d3463f4022061d14b3e24c6923d987b4c17e317dc1b1ec2c6c34e1f20deedf68f97eab9762541feffffff0200286bee000000001976a914f6b0a1ca060a9efb017e24864af78cd7dbdfe3cf88ac40c99a3b000000001976a914db856722ecc6ec4384a829dfc11b6fa13be5d49688ac65000000",
+    "00000020fecc584e156ced58667116adc01c1734bae5a1b07ae7107bac62c27c08f5e0618d19fd58766ec3e05db1c5d1350dcfd10311f1eba7275cade3749626685a57fd0eaf3e5dffff7f20000000000402000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d01670101082f454233322e302fffffffff017afc062a01000000232102e2a7b752674549a7cd7ab1c223ba1d5625ffbc264ccb78309e0904ef57e6c97dac0000000002000000015104c87bd0b351ac8db6f0751d88f91521951a6886a28ecf8077b043f2269ea2000000006a473044022018fb5b50734a674002f17e0a001ef43a5882b4692612b0e2edcd99ba35613ca0022050dfdf34d6a6a4e6be8641a9b15dd4d189c0b9d482e4a2eae72692d78d24fc1741210317de7ed25740360d259b69f7ee0424141413d0f390f97d43393b8a2b0e47f8bcfeffffff02005ed0b2000000001976a9143eab965a0ad02931cb35f07831a7380657c2d75188ac1ec99a3b000000001976a9148c02f3ed52eca01c36c3a297d654274d4ceff1ae88ac6600000002000000015104c87bd0b351ac8db6f0751d88f91521951a6886a28ecf8077b043f2269ea2010000006a47304402205a683139bb02036f22c586504b3ef1e4e277506a5fb77d7527078cb87ffc269f022079dadf2773ce4c9066ad3ffbeec52ebf80013fc19650b41d2f7fbdc817276d88412103fa5bd147600176539310fff685df6bae8486a78872b4d8e88ba60571894d3a8cfeffffff0240e8a435000000001976a9142457f993fecf4eedbb0f015affa4403793f888d188ac28d8f405000000001976a9145028dd7b86c119d50fa4e022a0c6741a4e3f9b4488ac660000000200000001ab6fdeb894ce3c54fb7cfc92eaac87c7dfd6cc9e62924c6c27f90b5b20c8e27c0000000049483045022100d76b717ffe3c67b580f2971ec0457c19e14b26f25ece8ca09c5fff3d9a0160c5022027cf7e9784dc66ac09b100e3c7cb24386894af829e9955f652d9124898db795041feffffff0200ca9a3b000000001976a914352f9afc79af6613cde35bd314edd884119ca5c588ac40276bee000000001976a914344471651783fc715833b477f89677d69f3a271788ac66000000"
+  ],
+  "mocktime": 1564389116,
+  "stats": [
+    {
+      "avgfee": 0.0,
+      "avgfeerate": 0.0,
+      "avgtxsize": 0,
+      "blockhash": "78a62acff8c7cf3d18e64dae0531acbf486373dade692aa2bfb8f54d5cae6c92",
+      "height": 101,
+      "ins": 0,
+      "maxfee": 0.0,
+      "maxfeerate": 0.0,
+      "maxtxsize": 0,
+      "medianfee": 0.0,
+      "medianfeerate": 0.0,
+      "mediantime": 1564389133,
+      "mediantxsize": 0,
+      "minfee": 0.0,
+      "minfeerate": 0.0,
+      "mintxsize": 0,
+      "outs": 1,
+      "subsidy": 50.0,
+      "time": 1564389134,
+      "total_out": 0.0,
+      "total_size": 0,
+      "totalfee": 0.0,
+      "txs": 1,
+      "utxo_increase": 1,
+      "utxo_size_inc": 85
+    },
+    {
+      "avgfee": 1.92e-06,
+      "avgfeerate": 1e-08,
+      "avgtxsize": 191,
+      "blockhash": "61e0f5087cc262ac7b10e77ab0a1e5ba34171cc0ad16716658ed6c154e58ccfe",
+      "height": 102,
+      "ins": 1,
+      "maxfee": 1.92e-06,
+      "maxfeerate": 1e-08,
+      "maxtxsize": 191,
+      "medianfee": 1.92e-06,
+      "medianfeerate": 1e-08,
+      "mediantime": 1564389133,
+      "mediantxsize": 191,
+      "minfee": 1.92e-06,
+      "minfeerate": 1e-08,
+      "mintxsize": 191,
+      "outs": 3,
+      "subsidy": 50.0,
+      "time": 1564389134,
+      "total_out": 49.99999808,
+      "total_size": 191,
+      "totalfee": 1.92e-06,
+      "txs": 2,
+      "utxo_increase": 2,
+      "utxo_size_inc": 150
+    },
+    {
+      "avgfee": 0.00022739,
+      "avgfeerate": 1.06e-06,
+      "avgtxsize": 214,
+      "blockhash": "1f5619699145227f1a725669a4a755689a95cedbc0a696f1964187264c596a86",
+      "height": 103,
+      "ins": 3,
+      "maxfee": 0.000678,
+      "maxfeerate": 3.01e-06,
+      "maxtxsize": 225,
+      "medianfee": 2.26e-06,
+      "medianfeerate": 1e-08,
+      "mediantime": 1564389134,
+      "mediantxsize": 225,
+      "minfee": 1.92e-06,
+      "minfeerate": 1e-08,
+      "mintxsize": 192,
+      "outs": 7,
+      "subsidy": 50.0,
+      "time": 1564389134,
+      "total_out": 99.9993159,
+      "total_size": 642,
+      "totalfee": 0.00068218,
+      "txs": 4,
+      "utxo_increase": 4,
+      "utxo_size_inc": 300
+    }
+  ]
+}
\ No newline at end of file
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/feature_cltv.py bitcoinabc-0.19.12-uahf/test/functional/feature_cltv.py
--- bitcoinabc-0.19.11-uahf/test/functional/feature_cltv.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/feature_cltv.py	2019-08-16 12:22:08.000000000 +0000
@@ -69,7 +69,6 @@
     fundtx.rehash()
 
     # make spending tx
-    from_txid = fundtx.hash
     inputs = [{
         "txid": fundtx.hash,
         "vout": 0
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/feature_maxuploadtarget.py bitcoinabc-0.19.12-uahf/test/functional/feature_maxuploadtarget.py
--- bitcoinabc-0.19.11-uahf/test/functional/feature_maxuploadtarget.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/feature_maxuploadtarget.py	2019-08-16 12:22:08.000000000 +0000
@@ -22,7 +22,7 @@
 from test_framework.util import assert_equal
 
 
-class TestNode(P2PInterface):
+class TestP2PConn(P2PInterface):
     def __init__(self):
         super().__init__()
         self.block_receive_map = defaultdict(int)
@@ -62,7 +62,7 @@
         p2p_conns = []
 
         for _ in range(3):
-            p2p_conns.append(self.nodes[0].add_p2p_connection(TestNode()))
+            p2p_conns.append(self.nodes[0].add_p2p_connection(TestP2PConn()))
 
         network_thread_start()
         for p2pc in p2p_conns:
@@ -157,7 +157,7 @@
                             "-maxuploadtarget=1", "-blockmaxsize=999000"])
 
         # Reconnect to self.nodes[0]
-        self.nodes[0].add_p2p_connection(TestNode())
+        self.nodes[0].add_p2p_connection(TestP2PConn())
 
         network_thread_start()
         self.nodes[0].p2p.wait_for_verack()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/feature_notifications.py bitcoinabc-0.19.12-uahf/test/functional/feature_notifications.py
--- bitcoinabc-0.19.11-uahf/test/functional/feature_notifications.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/feature_notifications.py	2019-08-16 12:22:08.000000000 +0000
@@ -43,7 +43,7 @@
             self.block_filename).st_size >= (block_count * 65), timeout=10)
 
         # file content should equal the generated blocks hashes
-        with open(self.block_filename, 'r') as f:
+        with open(self.block_filename, 'r', encoding="utf-8") as f:
             assert_equal(sorted(blocks), sorted(f.read().splitlines()))
 
         self.log.info("test -walletnotify")
@@ -54,7 +54,7 @@
         # file content should equal the generated transaction hashes
         txids_rpc = list(
             map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
-        with open(self.tx_filename, 'r') as f:
+        with open(self.tx_filename, 'r', encoding="ascii") as f:
             assert_equal(sorted(txids_rpc), sorted(f.read().splitlines()))
         os.remove(self.tx_filename)
 
@@ -69,7 +69,7 @@
         # file content should equal the generated transaction hashes
         txids_rpc = list(
             map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
-        with open(self.tx_filename, 'r') as f:
+        with open(self.tx_filename, 'r', encoding="ascii") as f:
             assert_equal(sorted(txids_rpc), sorted(f.read().splitlines()))
 
         # Create an invalid chain and ensure the node warns.
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/feature_nulldummy.py bitcoinabc-0.19.12-uahf/test/functional/feature_nulldummy.py
--- bitcoinabc-0.19.11-uahf/test/functional/feature_nulldummy.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/feature_nulldummy.py	2019-08-16 12:22:08.000000000 +0000
@@ -22,6 +22,12 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, assert_raises_rpc_error
 
+# This test checks for a reject reason that changes after the graviton
+# upgrade. Since the nulldummy effect and this test are destined to be removed
+# after the upgrade anyway, we run this test pre-upgrade only.
+# More detailed dummy tests can be found in abc-schnorrmultisig-activation.py.
+GRAVITON_START_TIME = 2000000000
+
 NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero) (code 64)"
 
 
@@ -43,7 +49,8 @@
     def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
-        self.extra_args = [['-whitelist=127.0.0.1']]
+        self.extra_args = [['-whitelist=127.0.0.1',
+                            "-gravitonactivationtime={}".format(GRAVITON_START_TIME)]]
 
     def run_test(self):
         self.address = self.nodes[0].getnewaddress()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/feature_uacomment.py bitcoinabc-0.19.12-uahf/test/functional/feature_uacomment.py
--- bitcoinabc-0.19.11-uahf/test/functional/feature_uacomment.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/feature_uacomment.py	2019-08-16 12:22:08.000000000 +0000
@@ -18,7 +18,6 @@
     def run_test(self):
         self.log.info("test multiple -uacomment")
         test_uacomment = self.nodes[0].getnetworkinfo()["subversion"]
-        subversion_len = len(test_uacomment)
         assert_equal(test_uacomment[-12:-2], "testnode-0")
 
         self.restart_node(0, ["-uacomment=foo"])
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/interface_rest.py bitcoinabc-0.19.12-uahf/test/functional/interface_rest.py
--- bitcoinabc-0.19.11-uahf/test/functional/interface_rest.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/interface_rest.py	2019-08-16 12:22:08.000000000 +0000
@@ -4,8 +4,9 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test the REST API."""
 
-from codecs import encode
+import binascii
 from decimal import Decimal
+from enum import Enum
 import http.client
 from io import BytesIO
 import json
@@ -16,381 +17,315 @@
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
-    connect_nodes_bi,
+    assert_greater_than_or_equal,
     hex_str_to_bytes,
 )
 
 
-def deser_uint256(f):
-    r = 0
-    for i in range(8):
-        t = unpack(b"<I", f.read(4))[0]
-        r += t << (i * 32)
-    return r
-
-# allows simple http get calls
-
-
-def http_get_call(host, port, path, response_object=0):
-    conn = http.client.HTTPConnection(host, port)
-    conn.request('GET', path)
-
-    if response_object:
-        return conn.getresponse()
-
-    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):
-    conn = http.client.HTTPConnection(host, port)
-    conn.request('POST', path, requestdata)
-
-    if response_object:
-        return conn.getresponse()
-
-    return conn.getresponse().read()
+class ReqType(Enum):
+    JSON = 1
+    BIN = 2
+    HEX = 3
+
+
+class RetType(Enum):
+    OBJ = 1
+    BYTES = 2
+    JSON = 3
+
+
+def filter_output_indices_by_value(vouts, value):
+    for vout in vouts:
+        if vout['value'] == value:
+            yield vout['n']
 
 
 class RESTTest (BitcoinTestFramework):
-    FORMAT_SEPARATOR = "."
-
     def set_test_params(self):
         self.setup_clean_chain = True
-        self.num_nodes = 3
-        self.extra_args = [["-rest"]] * self.num_nodes
+        self.num_nodes = 2
+        self.extra_args = [["-rest"], []]
 
-    def setup_network(self, split=False):
-        super().setup_network()
-        connect_nodes_bi(self.nodes[0], self.nodes[2])
+    def test_rest_request(self, uri, http_method='GET', req_type=ReqType.JSON, body='', status=200, ret_type=RetType.JSON):
+        rest_uri = '/rest' + uri
+        if req_type == ReqType.JSON:
+            rest_uri += '.json'
+        elif req_type == ReqType.BIN:
+            rest_uri += '.bin'
+        elif req_type == ReqType.HEX:
+            rest_uri += '.hex'
+
+        conn = http.client.HTTPConnection(self.url.hostname, self.url.port)
+        self.log.debug('{} {} {}'.format(http_method, rest_uri, body))
+        if http_method == 'GET':
+            conn.request('GET', rest_uri)
+        elif http_method == 'POST':
+            conn.request('POST', rest_uri, body)
+        resp = conn.getresponse()
+
+        assert_equal(resp.status, status)
+
+        if ret_type == RetType.OBJ:
+            return resp
+        elif ret_type == RetType.BYTES:
+            return resp.read()
+        elif ret_type == RetType.JSON:
+            return json.loads(resp.read().decode('utf-8'), parse_float=Decimal)
 
     def run_test(self):
-        url = urllib.parse.urlparse(self.nodes[0].url)
-        self.log.info("Mining blocks...")
+        self.url = urllib.parse.urlparse(self.nodes[0].url)
+        self.log.info("Mine blocks and send Bitcoin Cash to node 1")
+
+        # Random address so node1's balance doesn't increase
+        not_related_address = "2MxqoHEdNQTyYeX1mHcbrrpzgojbosTpCvJ"
 
         self.nodes[0].generate(1)
         self.sync_all()
-        self.nodes[2].generate(100)
+        self.nodes[1].generatetoaddress(100, not_related_address)
         self.sync_all()
 
         assert_equal(self.nodes[0].getbalance(), 50)
 
         txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)
         self.sync_all()
-        self.nodes[2].generate(1)
+        self.nodes[1].generatetoaddress(1, not_related_address)
         self.sync_all()
         bb_hash = self.nodes[0].getbestblockhash()
 
         assert_equal(self.nodes[1].getbalance(), Decimal("0.1"))
-        # balance now should be 0.1 on node 1
 
-        # load the latest 0.1 tx over the REST API
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/tx/' + txid + self.FORMAT_SEPARATOR + "json")
-        json_obj = json.loads(json_string)
-        vintx = json_obj['vin'][0]['txid']
-        # get the vin to later check for utxo (should be spent by then)
-        # get n of 0.1 outpoint
-        n = 0
-        for vout in json_obj['vout']:
-            if vout['value'] == 0.1:
-                n = vout['n']
-
-        #
-        # GETUTXOS: query an unspent outpoint #
-        #
-        json_request = '/checkmempool/' + txid + '-' + str(n)
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/getutxos' + json_request + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        self.log.info("Load the transaction using the /tx URI")
+
+        json_obj = self.test_rest_request("/tx/{}".format(txid))
+        # Get the vin to later check for utxo (should be spent by then)
+        spent = (json_obj['vin'][0]['txid'], json_obj['vin'][0]['vout'])
+        # Get n of 0.1 outpoint
+        n, = filter_output_indices_by_value(json_obj['vout'], Decimal('0.1'))
+        spending = (txid, n)
+
+        self.log.info("Query an unspent TXO using the /getutxos URI")
+
+        json_obj = self.test_rest_request("/getutxos/{}-{}".format(*spending))
 
-        # check chainTip response
+        # Check chainTip response
         assert_equal(json_obj['chaintipHash'], bb_hash)
 
-        # make sure there is one utxo
+        # Make sure there is one utxo
         assert_equal(len(json_obj['utxos']), 1)
-        assert_equal(json_obj['utxos'][0]['value'], 0.1)
+        assert_equal(json_obj['utxos'][0]['value'], Decimal('0.1'))
 
-        #
-        # GETUTXOS: now query an already spent outpoint #
-        #
-        json_request = '/checkmempool/' + vintx + '-0'
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/getutxos' + json_request + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        self.log.info("Query a spent TXO using the /getutxos URI")
 
-        # check chainTip response
+        json_obj = self.test_rest_request("/getutxos/{}-{}".format(*spent))
+
+        # Check chainTip response
         assert_equal(json_obj['chaintipHash'], bb_hash)
 
-        # make sure there is no utox in the response because this oupoint has
+        # Make sure there is no utxo in the response because this outpoint has
         # been spent
         assert_equal(len(json_obj['utxos']), 0)
 
-        # check bitmap
+        # Check bitmap
         assert_equal(json_obj['bitmap'], "0")
 
-        #
-        # GETUTXOS: now check both with the same request #
-        #
-        json_request = '/checkmempool/' + \
-            txid + '-' + str(n) + '/' + vintx + '-0'
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/getutxos' + json_request + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        self.log.info("Query two TXOs using the /getutxos URI")
+
+        json_obj = self.test_rest_request(
+            "/getutxos/{}-{}/{}-{}".format(*(spending + spent)))
+
         assert_equal(len(json_obj['utxos']), 1)
         assert_equal(json_obj['bitmap'], "10")
 
-        # test binary response
-        bb_hash = self.nodes[0].getbestblockhash()
+        self.log.info(
+            "Query the TXOs using the /getutxos URI with a binary response")
 
-        binaryRequest = b'\x01\x02'
-        binaryRequest += hex_str_to_bytes(txid)
-        binaryRequest += pack("i", n)
-        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)
-        output = BytesIO()
-        output.write(bin_response)
-        output.seek(0)
-        chainHeight = unpack("i", output.read(4))[0]
-        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
-
-        #
-        # GETUTXOS: mempool checks #
-        #
+        bin_request = b'\x01\x02'
+        for txid, n in [spending, spent]:
+            bin_request += hex_str_to_bytes(txid)
+            bin_request += pack("i", n)
+
+        bin_response = self.test_rest_request(
+            "/getutxos", http_method='POST', req_type=ReqType.BIN, body=bin_request, ret_type=RetType.BYTES)
+        output = BytesIO(bin_response)
+        chain_height, = unpack("i", output.read(4))
+        response_hash = binascii.hexlify(output.read(32)[::-1]).decode('ascii')
+
+        # Check if getutxo's chaintip during calculation was fine
+        assert_equal(bb_hash, response_hash)
+        # Chain height must be 102
+        assert_equal(chain_height, 102)
+
+        self.log.info("Test the /getutxos URI with and without /checkmempool")
+        # Create a transaction, check that it's found with /checkmempool, but
+        # not found without. Then confirm the transaction and check that it's
+        # found with or without /checkmempool.
 
-        # do a tx and don't sync
+        # Do a tx and don't sync
         txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/tx/' + txid + self.FORMAT_SEPARATOR + "json")
-        json_obj = json.loads(json_string)
-        vintx = json_obj['vin'][0]['txid']
-        # get the vin to later check for utxo (should be spent by then)
-        # get n of 0.1 outpoint
-        n = 0
-        for vout in json_obj['vout']:
-            if vout['value'] == 0.1:
-                n = vout['n']
-
-        json_request = '/' + txid + '-' + str(n)
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/getutxos' + json_request + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
-        # there should be an outpoint because it has just added to
-        # the mempool
+        json_obj = self.test_rest_request("/tx/{}".format(txid))
+        # Get the spent output to later check for utxo (should be spent by then)
+        spent = (json_obj['vin'][0]['txid'], json_obj['vin'][0]['vout'])
+        # Get n of 0.1 outpoint
+        n, = filter_output_indices_by_value(json_obj['vout'], Decimal('0.1'))
+        spending = (txid, n)
+
+        json_obj = self.test_rest_request("/getutxos/{}-{}".format(*spending))
         assert_equal(len(json_obj['utxos']), 0)
 
-        json_request = '/checkmempool/' + txid + '-' + str(n)
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/getutxos' + json_request + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
-        # there should be an outpoint because it has just added to
-        # the mempool
+        json_obj = self.test_rest_request(
+            "/getutxos/checkmempool/{}-{}".format(*spending))
+        assert_equal(len(json_obj['utxos']), 1)
+
+        json_obj = self.test_rest_request("/getutxos/{}-{}".format(*spent))
         assert_equal(len(json_obj['utxos']), 1)
 
-        # do some invalid requests
-        json_request = '{"checkmempool'
-        response = http_post_call(
-            url.hostname, url.port, '/rest/getutxos' + self.FORMAT_SEPARATOR + 'json', json_request, True)
-        # must be a 400 because we send an invalid json request
-        assert_equal(response.status, 400)
-
-        json_request = '{"checkmempool'
-        response = http_post_call(
-            url.hostname, url.port, '/rest/getutxos' + self.FORMAT_SEPARATOR + 'bin', json_request, True)
-        # must be a 400 because we send an invalid bin request
-        assert_equal(response.status, 400)
-
-        response = http_post_call(
-            url.hostname, url.port, '/rest/getutxos/checkmempool' + self.FORMAT_SEPARATOR + 'bin', '', True)
-        # must be a 400 because we send an invalid bin request
-        assert_equal(response.status, 400)
-
-        # test limits
-        json_request = '/checkmempool/'
-        for x in range(0, 20):
-            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, 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 200 because we are within the limits
+        json_obj = self.test_rest_request(
+            "/getutxos/checkmempool/{}-{}".format(*spent))
+        assert_equal(len(json_obj['utxos']), 0)
+
+        self.nodes[0].generate(1)
+        self.sync_all()
 
+        json_obj = self.test_rest_request("/getutxos/{}-{}".format(*spending))
+        assert_equal(len(json_obj['utxos']), 1)
+
+        json_obj = self.test_rest_request(
+            "/getutxos/checkmempool/{}-{}".format(*spending))
+        assert_equal(len(json_obj['utxos']), 1)
+
+        # Do some invalid requests
+        self.test_rest_request("/getutxos", http_method='POST', req_type=ReqType.JSON,
+                               body='{"checkmempool', status=400, ret_type=RetType.OBJ)
+        self.test_rest_request("/getutxos", http_method='POST', req_type=ReqType.BIN,
+                               body='{"checkmempool', status=400, ret_type=RetType.OBJ)
+        self.test_rest_request("/getutxos/checkmempool", http_method='POST',
+                               req_type=ReqType.JSON, status=400, ret_type=RetType.OBJ)
+
+        # Test limits
+        long_uri = '/'.join(["{}-{}".format(txid, n_) for n_ in range(20)])
+        self.test_rest_request("/getutxos/checkmempool/{}".format(long_uri),
+                               http_method='POST', status=400, ret_type=RetType.OBJ)
+
+        long_uri = '/'.join(['{}-{}'.format(txid, n_) for n_ in range(15)])
+        self.test_rest_request(
+            "/getutxos/checkmempool/{}".format(long_uri), http_method='POST', status=200)
+
+        # Generate block to not affect upcoming tests
         self.nodes[0].generate(
-            1)  # generate block to not affect upcoming tests
+            1)
         self.sync_all()
 
-        #
-        # /rest/block/ #
-        #
-
-        # check binary format
-        response = http_get_call(
-            url.hostname, url.port, '/rest/block/' + bb_hash + self.FORMAT_SEPARATOR + "bin", True)
-        assert_equal(response.status, 200)
+        self.log.info("Test the /block and /headers URIs")
+        bb_hash = self.nodes[0].getbestblockhash()
+
+        # Check binary format
+        response = self.test_rest_request(
+            "/block/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
         assert_greater_than(int(response.getheader('content-length')), 80)
-        response_str = response.read()
+        response_bytes = response.read()
 
-        # compare with block header
-        response_header = http_get_call(
-            url.hostname, url.port, '/rest/headers/1/' + bb_hash + self.FORMAT_SEPARATOR + "bin", True)
-        assert_equal(response_header.status, 200)
+        # Compare with block header
+        response_header = self.test_rest_request(
+            "/headers/1/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
         assert_equal(int(response_header.getheader('content-length')), 80)
-        response_header_str = response_header.read()
-        assert_equal(response_str[0:80], response_header_str)
+        response_header_bytes = response_header.read()
+        assert_equal(response_bytes[0:80], response_header_bytes)
 
-        # check block hex format
-        response_hex = http_get_call(
-            url.hostname, url.port, '/rest/block/' + bb_hash + self.FORMAT_SEPARATOR + "hex", True)
-        assert_equal(response_hex.status, 200)
+        # Check block hex format
+        response_hex = self.test_rest_request(
+            "/block/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
         assert_greater_than(int(response_hex.getheader('content-length')), 160)
-        response_hex_str = response_hex.read()
-        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)
-        assert_equal(response_header_hex.status, 200)
+        response_hex_bytes = response_hex.read().strip(b'\n')
+        assert_equal(binascii.hexlify(response_bytes), response_hex_bytes)
+
+        # Compare with hex block header
+        response_header_hex = self.test_rest_request(
+            "/headers/1/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
         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_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')
-        block_json_obj = json.loads(block_json_string)
+        response_header_hex_bytes = response_header_hex.read(160)
+        assert_equal(binascii.hexlify(
+            response_bytes[:80]), response_header_hex_bytes)
+
+        # Check json format
+        block_json_obj = self.test_rest_request("/block/{}".format(bb_hash))
         assert_equal(block_json_obj['hash'], bb_hash)
 
-        # 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().decode('utf-8')
-        json_obj = json.loads(response_header_json_str, parse_float=Decimal)
+        # Compare with json block header
+        json_obj = self.test_rest_request("/headers/1/{}".format(bb_hash))
+        # Ensure that there is one header in the json response
         assert_equal(len(json_obj), 1)
-        # ensure that there is one header in the json response
+        # Request/response hash should be the same
         assert_equal(json_obj[0]['hash'], bb_hash)
-        # request/response hash should be the same
 
-        # compare with normal RPC block response
+        # Compare with normal RPC block response
         rpc_block_json = self.nodes[0].getblock(bb_hash)
-        assert_equal(json_obj[0]['hash'],               rpc_block_json['hash'])
-        assert_equal(
-            json_obj[0]['confirmations'],      rpc_block_json['confirmations'])
-        assert_equal(
-            json_obj[0]['height'],             rpc_block_json['height'])
-        assert_equal(
-            json_obj[0]['version'],            rpc_block_json['version'])
-        assert_equal(
-            json_obj[0]['merkleroot'],         rpc_block_json['merkleroot'])
-        assert_equal(json_obj[0]['time'],               rpc_block_json['time'])
-        assert_equal(
-            json_obj[0]['nonce'],              rpc_block_json['nonce'])
-        assert_equal(json_obj[0]['bits'],               rpc_block_json['bits'])
-        assert_equal(
-            json_obj[0]['difficulty'],         rpc_block_json['difficulty'])
-        assert_equal(
-            json_obj[0]['chainwork'],          rpc_block_json['chainwork'])
-        assert_equal(
-            json_obj[0]['previousblockhash'],  rpc_block_json['previousblockhash'])
+        for key in ['hash', 'confirmations', 'height', 'version', 'merkleroot', 'time', 'nonce', 'bits', 'difficulty', 'chainwork', 'previousblockhash']:
+            assert_equal(json_obj[0][key], rpc_block_json[key])
 
-        # see if we can get 5 headers in one response
+        # See if we can get 5 headers in one response
         self.nodes[1].generate(5)
         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().decode('utf-8')
-        json_obj = json.loads(response_header_json_str)
-        assert_equal(len(json_obj), 5)  # now we should have 5 header objects
+        json_obj = self.test_rest_request("/headers/5/{}".format(bb_hash))
+        # Now we should have 5 header objects
+        assert_equal(len(json_obj), 5)
+
+        self.log.info("Test the /tx URI")
 
-        # do tx test
         tx_hash = block_json_obj['tx'][0]['txid']
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/tx/' + tx_hash + self.FORMAT_SEPARATOR + "json")
-        json_obj = json.loads(json_string)
+        json_obj = self.test_rest_request("/tx/{}".format(tx_hash))
         assert_equal(json_obj['txid'], tx_hash)
 
-        # check hex format response
-        hex_string = http_get_call(
-            url.hostname, url.port, '/rest/tx/' + tx_hash + self.FORMAT_SEPARATOR + "hex", True)
-        assert_equal(hex_string.status, 200)
-        assert_greater_than(int(response.getheader('content-length')), 10)
+        # Check hex format response
+        hex_response = self.test_rest_request(
+            "/tx/{}".format(tx_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
+        assert_greater_than_or_equal(
+            int(hex_response.getheader('content-length')), json_obj['size']*2)
 
-        # check block tx details
-        # let's make 3 tx and mine them on node 1
+        self.log.info("Test tx inclusion in the /mempool and /block URIs")
+
+        # Make 3 tx and mine them on node 1
         txs = []
-        txs.append(self.nodes[0].sendtoaddress(
-            self.nodes[2].getnewaddress(), 11))
-        txs.append(self.nodes[0].sendtoaddress(
-            self.nodes[2].getnewaddress(), 11))
-        txs.append(self.nodes[0].sendtoaddress(
-            self.nodes[2].getnewaddress(), 11))
+        txs.append(self.nodes[0].sendtoaddress(not_related_address, 11))
+        txs.append(self.nodes[0].sendtoaddress(not_related_address, 11))
+        txs.append(self.nodes[0].sendtoaddress(not_related_address, 11))
         self.sync_all()
 
-        # check that there are exactly 3 transactions in the TX memory pool
+        # Check that there are exactly 3 transactions in the TX memory pool
         # before generating the block
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/mempool/info' + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        json_obj = self.test_rest_request("/mempool/info")
         assert_equal(json_obj['size'], 3)
-        # the size of the memory pool should be greater than 3x ~100 bytes
+        # The size of the memory pool should be greater than 3x ~100 bytes
         assert_greater_than(json_obj['bytes'], 300)
 
-        # check that there are our submitted transactions in the TX memory pool
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/mempool/contents' + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        # Check that there are our submitted transactions in the TX memory pool
+        json_obj = self.test_rest_request("/mempool/contents")
         for i, tx in enumerate(txs):
-            assert_equal(tx in json_obj, True)
+            assert tx in json_obj
             assert_equal(json_obj[tx]['spentby'], txs[i + 1:i + 2])
             assert_equal(json_obj[tx]['depends'], txs[i - 1:i])
 
-        # now mine the transactions
+        # Now mine the transactions
         newblockhash = self.nodes[1].generate(1)
         self.sync_all()
 
-        # check if the 3 tx show up in the new block
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/block/' + newblockhash[0] + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
-        for tx in json_obj['tx']:
-            if not 'coinbase' in tx['vin'][0]:  # exclude coinbase
-                assert_equal(tx['txid'] in txs, True)
-
-        # check the same but without tx details
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/block/notxdetails/' + newblockhash[0] + self.FORMAT_SEPARATOR + 'json')
-        json_obj = json.loads(json_string)
+        # Check if the 3 tx show up in the new block
+        json_obj = self.test_rest_request("/block/{}".format(newblockhash[0]))
+        non_coinbase_txs = {tx['txid']
+                            for tx in json_obj['tx'] if 'coinbase' not in tx['vin'][0]}
+        assert_equal(non_coinbase_txs, set(txs))
+
+        # Check the same but without tx details
+        json_obj = self.test_rest_request(
+            "/block/notxdetails/{}".format(newblockhash[0]))
         for tx in txs:
-            assert_equal(tx in json_obj['tx'], True)
+            assert tx in json_obj['tx']
+
+        self.log.info("Test the /chaininfo URI")
 
-        # test rest bestblock
         bb_hash = self.nodes[0].getbestblockhash()
 
-        json_string = http_get_call(
-            url.hostname, url.port, '/rest/chaininfo.json')
-        json_obj = json.loads(json_string)
+        json_obj = self.test_rest_request("/chaininfo")
         assert_equal(json_obj['bestblockhash'], bb_hash)
 
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/interface_zmq.py bitcoinabc-0.19.12-uahf/test/functional/interface_zmq.py
--- bitcoinabc-0.19.11-uahf/test/functional/interface_zmq.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/interface_zmq.py	2019-08-16 12:22:08.000000000 +0000
@@ -48,7 +48,7 @@
 
         # Check that bitcoin has been built with ZMQ enabled.
         config = configparser.ConfigParser()
-        config.read_file(open(self.options.configfile))
+        config.read_file(open(self.options.configfile, encoding='utf-8'))
 
         if not config["components"].getboolean("ENABLE_ZMQ"):
             raise SkipTest("bitcoind has not been built with zmq enabled.")
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/p2p_compactblocks.py bitcoinabc-0.19.12-uahf/test/functional/p2p_compactblocks.py
--- bitcoinabc-0.19.11-uahf/test/functional/p2p_compactblocks.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/p2p_compactblocks.py	2019-08-16 12:22:08.000000000 +0000
@@ -50,10 +50,10 @@
 from test_framework.txtools import pad_tx
 from test_framework.util import assert_equal, sync_blocks, wait_until
 
-# TestNode: A peer we use to send messages to bitcoind, and store responses.
+# TestP2PConn: A peer we use to send messages to bitcoind, and store responses.
 
 
-class TestNode(P2PInterface):
+class TestP2PConn(P2PInterface):
     def __init__(self):
         super().__init__()
         self.last_sendcmpct = []
@@ -836,11 +836,11 @@
 
     def run_test(self):
         # Setup the p2p connections and start up the network thread.
-        self.test_node = self.nodes[0].add_p2p_connection(TestNode())
+        self.test_node = self.nodes[0].add_p2p_connection(TestP2PConn())
         self.ex_softfork_node = self.nodes[1].add_p2p_connection(
-            TestNode(), services=NODE_NETWORK)
+            TestP2PConn(), services=NODE_NETWORK)
         self.old_node = self.nodes[1].add_p2p_connection(
-            TestNode(), services=NODE_NETWORK)
+            TestP2PConn(), services=NODE_NETWORK)
 
         network_thread_start()
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/p2p_feefilter.py bitcoinabc-0.19.12-uahf/test/functional/p2p_feefilter.py
--- bitcoinabc-0.19.11-uahf/test/functional/p2p_feefilter.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/p2p_feefilter.py	2019-08-16 12:22:08.000000000 +0000
@@ -32,7 +32,7 @@
     return False
 
 
-class TestNode(P2PInterface):
+class TestP2PConn(P2PInterface):
     def __init__(self):
         super().__init__()
         self.txinvs = []
@@ -59,7 +59,7 @@
         sync_blocks(self.nodes)
 
         # Setup the p2p connections and start up the network thread.
-        self.nodes[0].add_p2p_connection(TestNode())
+        self.nodes[0].add_p2p_connection(TestP2PConn())
         network_thread_start()
         self.nodes[0].p2p.wait_for_verack()
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/p2p_invalid_tx.py bitcoinabc-0.19.12-uahf/test/functional/p2p_invalid_tx.py
--- bitcoinabc-0.19.11-uahf/test/functional/p2p_invalid_tx.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/p2p_invalid_tx.py	2019-08-16 12:22:08.000000000 +0000
@@ -28,10 +28,6 @@
 )
 
 
-REJECT_INVALID = 16
-REJECT_PUSHONLY = b'mandatory-script-verify-flag-failed (Only push operators allowed in signature scripts)'
-
-
 class InvalidTxRequestTest(BitcoinTestFramework):
 
     def set_test_params(self):
@@ -84,8 +80,8 @@
         self.log.info('Test a transaction that is rejected')
         tx1 = create_transaction(
             block1.vtx[0], 0, b'\x64' * 35, 50 * COIN - 12000)
-        node.p2p.send_txs_and_test([tx1], node, success=False, expect_disconnect=True,
-                                   reject_code=REJECT_INVALID, reject_reason=REJECT_PUSHONLY)
+        node.p2p.send_txs_and_test(
+            [tx1], node, success=False, expect_disconnect=True)
 
         # Make two p2p connections to provide the node with orphans
         # * p2ps[0] will send valid orphan txs (one with low fee)
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/p2p_leak.py bitcoinabc-0.19.12-uahf/test/functional/p2p_leak.py
--- bitcoinabc-0.19.11-uahf/test/functional/p2p_leak.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/p2p_leak.py	2019-08-16 12:22:08.000000000 +0000
@@ -13,6 +13,11 @@
 
 import time
 
+from test_framework.messages import (
+    msg_getaddr,
+    msg_ping,
+    msg_verack,
+)
 from test_framework.mininode import (
     mininode_lock,
     network_thread_join,
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/p2p_timeouts.py bitcoinabc-0.19.12-uahf/test/functional/p2p_timeouts.py
--- bitcoinabc-0.19.11-uahf/test/functional/p2p_timeouts.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/p2p_timeouts.py	2019-08-16 12:22:08.000000000 +0000
@@ -28,7 +28,7 @@
 from test_framework.test_framework import BitcoinTestFramework
 
 
-class TestNode(P2PInterface):
+class TestP2PConn(P2PInterface):
     def on_version(self, message):
         # Don't send a verack in response
         pass
@@ -41,11 +41,11 @@
 
     def run_test(self):
         # Setup the p2p connections and start up the network thread.
-        no_verack_node = self.nodes[0].add_p2p_connection(TestNode())
+        no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn())
         no_version_node = self.nodes[0].add_p2p_connection(
-            TestNode(), send_version=False)
+            TestP2PConn(), send_version=False)
         no_send_node = self.nodes[0].add_p2p_connection(
-            TestNode(), send_version=False)
+            TestP2PConn(), send_version=False)
 
         network_thread_start()
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/rpc_blockchain.py bitcoinabc-0.19.12-uahf/test/functional/rpc_blockchain.py
--- bitcoinabc-0.19.11-uahf/test/functional/rpc_blockchain.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/rpc_blockchain.py	2019-08-16 12:22:08.000000000 +0000
@@ -33,6 +33,17 @@
     assert_is_hash_string,
     assert_is_hex_string,
 )
+from test_framework.blocktools import (
+    create_block,
+    create_coinbase,
+)
+from test_framework.messages import (
+    msg_block,
+)
+from test_framework.mininode import (
+    P2PInterface,
+    network_thread_start,
+)
 
 
 class BlockchainTest(BitcoinTestFramework):
@@ -50,6 +61,7 @@
         self._test_getnetworkhashps()
         self._test_stopatheight()
         self._test_getblock()
+        self._test_waitforblockheight()
         assert self.nodes[0].verifychain(4, 0)
 
     def _test_getblockchaininfo(self):
@@ -293,6 +305,50 @@
         assert_equal(
             getblockinfo['nextblockhash'], getblockheaderinfo['nextblockhash'])
 
+    def _test_waitforblockheight(self):
+        self.log.info("Test waitforblockheight")
+
+        node = self.nodes[0]
+
+        # Start a P2P connection since we'll need to create some blocks.
+        node.add_p2p_connection(P2PInterface())
+        network_thread_start()
+        node.p2p.wait_for_verack()
+
+        current_height = node.getblock(node.getbestblockhash())['height']
+
+        # Create a fork somewhere below our current height, invalidate the tip
+        # of that fork, and then ensure that waitforblockheight still
+        # works as expected.
+        #
+        # (Previously this was broken based on setting
+        # `rpc/blockchain.cpp:latestblock` incorrectly.)
+        #
+        b20hash = node.getblockhash(20)
+        b20 = node.getblock(b20hash)
+
+        def solve_and_send_block(prevhash, height, time):
+            b = create_block(prevhash, create_coinbase(height), time)
+            b.solve()
+            node.p2p.send_message(msg_block(b))
+            node.p2p.sync_with_ping()
+            return b
+
+        b21f = solve_and_send_block(int(b20hash, 16), 21, b20['time'] + 1)
+        b22f = solve_and_send_block(b21f.sha256, 22, b21f.nTime + 1)
+
+        node.invalidateblock(b22f.hash)
+
+        def assert_waitforheight(height, timeout=2):
+            assert_equal(
+                node.waitforblockheight(height, timeout)['height'],
+                current_height)
+
+        assert_waitforheight(0)
+        assert_waitforheight(current_height - 1)
+        assert_waitforheight(current_height)
+        assert_waitforheight(current_height + 1)
+
 
 if __name__ == '__main__':
     BlockchainTest().main()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/rpc_getblockstats.py bitcoinabc-0.19.12-uahf/test/functional/rpc_getblockstats.py
--- bitcoinabc-0.19.11-uahf/test/functional/rpc_getblockstats.py	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/rpc_getblockstats.py	2019-08-16 12:22:08.000000000 +0000
@@ -0,0 +1,204 @@
+#!/usr/bin/env python3
+# Copyright (c) 2017-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.
+
+#
+# Test getblockstats rpc call
+#
+import decimal
+import json
+import os
+import time
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+
+TESTSDIR = os.path.dirname(os.path.realpath(__file__))
+
+
+def EncodeDecimal(o):
+    if isinstance(o, decimal.Decimal):
+        # json.load will read a quoted float as a string and not convert it back
+        # to decimal, so store the value as unquoted float instead.
+        return float(o)
+    raise TypeError(repr(o) + " is not JSON serializable")
+
+
+class GetblockstatsTest(BitcoinTestFramework):
+
+    start_height = 101
+    max_stat_pos = 2
+    STATS_NEED_TXINDEX = [
+        'avgfee',
+        'avgfeerate',
+        'maxfee',
+        'maxfeerate',
+        'medianfee',
+        'medianfeerate',
+        'minfee',
+        'minfeerate',
+        'totalfee',
+        'utxo_size_inc',
+    ]
+
+    def add_options(self, parser):
+        parser.add_argument('--gen-test-data', dest='gen_test_data',
+                            default=False, action='store_true',
+                            help='Generate test data')
+        parser.add_argument('--test-data', dest='test_data',
+                            default='data/rpc_getblockstats.json',
+                            action='store', metavar='FILE',
+                            help='Test data file')
+
+    def set_test_params(self):
+        self.num_nodes = 2
+        self.extra_args = [['-txindex'], ['-paytxfee=0.003']]
+        self.setup_clean_chain = True
+
+    def get_stats(self):
+        return [self.nodes[0].getblockstats(hash_or_height=self.start_height + i) for i in range(self.max_stat_pos + 1)]
+
+    def generate_test_data(self, filename):
+        mocktime = time.time()
+        self.nodes[0].generate(101)
+
+        self.nodes[0].sendtoaddress(
+            address=self.nodes[1].getnewaddress(), amount=10, subtractfeefromamount=True)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        self.nodes[0].sendtoaddress(
+            address=self.nodes[0].getnewaddress(), amount=10, subtractfeefromamount=True)
+        self.nodes[0].sendtoaddress(
+            address=self.nodes[0].getnewaddress(), amount=10, subtractfeefromamount=False)
+        self.nodes[1].sendtoaddress(
+            address=self.nodes[0].getnewaddress(), amount=1, subtractfeefromamount=True)
+        self.sync_all()
+        self.nodes[0].generate(1)
+
+        self.expected_stats = self.get_stats()
+
+        blocks = []
+        tip = self.nodes[0].getbestblockhash()
+        blockhash = None
+        height = 0
+        while tip != blockhash:
+            blockhash = self.nodes[0].getblockhash(height)
+            blocks.append(self.nodes[0].getblock(blockhash, 0))
+            height += 1
+
+        to_dump = {
+            'blocks': blocks,
+            'mocktime': int(mocktime),
+            'stats': self.expected_stats,
+        }
+        with open(filename, 'w', encoding="utf8") as f:
+            json.dump(to_dump, f, sort_keys=True,
+                      indent=2, default=EncodeDecimal)
+
+    def load_test_data(self, filename):
+        with open(filename, 'r', encoding="utf8") as f:
+            d = json.load(f, parse_float=decimal.Decimal)
+            blocks = d['blocks']
+            mocktime = d['mocktime']
+            self.expected_stats = d['stats']
+            self.log.info(self.expected_stats)
+
+        # Set the timestamps from the file so that the nodes can get out of Initial Block Download
+        self.nodes[0].setmocktime(mocktime)
+        self.nodes[1].setmocktime(mocktime)
+
+        for i, b in enumerate(blocks):
+            self.nodes[0].submitblock(b)
+
+    def run_test(self):
+        test_data = os.path.join(TESTSDIR, self.options.test_data)
+        if self.options.gen_test_data:
+            self.generate_test_data(test_data)
+        else:
+            self.load_test_data(test_data)
+
+        self.sync_all()
+        stats = self.get_stats()
+        expected_stats_noindex = []
+        for stat_row in stats:
+            expected_stats_noindex.append(
+                {k: v for k, v in stat_row.items() if k not in self.STATS_NEED_TXINDEX})
+
+        # Make sure all valid statistics are included but nothing else is
+        expected_keys = self.expected_stats[0].keys()
+        assert_equal(set(stats[0].keys()), set(expected_keys))
+
+        assert_equal(stats[0]['height'], self.start_height)
+        assert_equal(stats[self.max_stat_pos]['height'],
+                     self.start_height + self.max_stat_pos)
+
+        for i in range(self.max_stat_pos + 1):
+            self.log.info('Checking block {}\n'.format(i))
+            assert_equal(stats[i], self.expected_stats[i])
+
+            # Check selecting block by hash too
+            blockhash = self.expected_stats[i]['blockhash']
+            stats_by_hash = self.nodes[0].getblockstats(
+                hash_or_height=blockhash)
+            assert_equal(stats_by_hash, self.expected_stats[i])
+
+            # Check with the node that has no txindex
+            stats_no_txindex = self.nodes[1].getblockstats(
+                hash_or_height=blockhash, stats=list(expected_stats_noindex[i].keys()))
+            assert_equal(stats_no_txindex, expected_stats_noindex[i])
+
+        # Make sure each stat can be queried on its own
+        for stat in expected_keys:
+            for i in range(self.max_stat_pos + 1):
+                result = self.nodes[0].getblockstats(
+                    hash_or_height=self.start_height + i, stats=[stat])
+                assert_equal(list(result.keys()), [stat])
+                if result[stat] != self.expected_stats[i][stat]:
+                    self.log.info('result[{}] ({}) failed, {!r} != {!r}'.format(
+                        stat, i, result[stat], self.expected_stats[i][stat]))
+                assert_equal(result[stat], self.expected_stats[i][stat])
+
+        # Make sure only the selected statistics are included (more than one)
+        some_stats = {'minfee', 'maxfee'}
+        stats = self.nodes[0].getblockstats(
+            hash_or_height=1, stats=list(some_stats))
+        assert_equal(set(stats.keys()), some_stats)
+
+        # Test invalid parameters raise the proper json exceptions
+        tip = self.start_height + self.max_stat_pos
+        assert_raises_rpc_error(-8, 'Target block height {} after current tip {}'.format(
+            tip + 1, tip), self.nodes[0].getblockstats, hash_or_height=tip + 1)
+        assert_raises_rpc_error(-8, 'Target block height {} is negative'.format(-1),
+                                self.nodes[0].getblockstats, hash_or_height=-1)
+
+        # Make sure not valid stats aren't allowed
+        inv_sel_stat = 'asdfghjkl'
+        inv_stats = [
+            [inv_sel_stat],
+            ['minfee', inv_sel_stat],
+            [inv_sel_stat, 'minfee'],
+            ['minfee', inv_sel_stat, 'maxfee'],
+        ]
+        for inv_stat in inv_stats:
+            assert_raises_rpc_error(-8, 'Invalid selected statistic {}'.format(
+                inv_sel_stat), self.nodes[0].getblockstats, hash_or_height=1, stats=inv_stat)
+
+        # Make sure we aren't always returning inv_sel_stat as the culprit stat
+        assert_raises_rpc_error(-8, 'Invalid selected statistic aaa{}'.format(inv_sel_stat),
+                                self.nodes[0].getblockstats, hash_or_height=1, stats=['minfee', 'aaa{}'.format(inv_sel_stat)])
+
+        assert_raises_rpc_error(-8, 'One or more of the selected stats requires -txindex enabled',
+                                self.nodes[1].getblockstats, hash_or_height=self.start_height + self.max_stat_pos)
+
+        # Mainchain's genesis block shouldn't be found on regtest
+        assert_raises_rpc_error(-5, 'Block not found', self.nodes[0].getblockstats,
+                                hash_or_height='000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f')
+
+
+if __name__ == '__main__':
+    GetblockstatsTest().main()
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/rpc_rawtransaction.py bitcoinabc-0.19.12-uahf/test/functional/rpc_rawtransaction.py
--- bitcoinabc-0.19.11-uahf/test/functional/rpc_rawtransaction.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/rpc_rawtransaction.py	2019-08-16 12:22:08.000000000 +0000
@@ -368,7 +368,7 @@
             rawTx2, inputs)
         self.log.debug(rawTxPartialSigned1)
         # node1 only has one key, can't comp. sign the tx
-        assert_equal(rawTxPartialSigned['complete'], False)
+        assert_equal(rawTxPartialSigned1['complete'], False)
 
         rawTxPartialSigned2 = self.nodes[2].signrawtransactionwithwallet(
             rawTx2, inputs)
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/rpc_users.py bitcoinabc-0.19.12-uahf/test/functional/rpc_users.py
--- bitcoinabc-0.19.11-uahf/test/functional/rpc_users.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/rpc_users.py	2019-08-16 12:22:08.000000000 +0000
@@ -7,6 +7,10 @@
 import http.client
 import os
 import urllib.parse
+import subprocess
+from random import SystemRandom
+import string
+import configparser
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -27,9 +31,22 @@
         rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
         rpcuser = "rpcuser=rpcuser💻"
         rpcpassword = "rpcpassword=rpcpassword🔑"
+
+        self.user = ''.join(SystemRandom().choice(
+            string.ascii_letters + string.digits) for _ in range(10))
+        config = configparser.ConfigParser()
+        config.read_file(open(self.options.configfile, encoding='utf-8'))
+        gen_rpcauth = config['environment']['RPCAUTH']
+        p = subprocess.Popen([gen_rpcauth, self.user],
+                             stdout=subprocess.PIPE, universal_newlines=True)
+        lines = p.stdout.read().splitlines()
+        rpcauth3 = lines[1]
+        self.password = lines[3]
+
         with open(os.path.join(get_datadir_path(self.options.tmpdir, 0), "bitcoin.conf"), 'a', encoding='utf8') as f:
             f.write(rpcauth + "\n")
             f.write(rpcauth2 + "\n")
+            f.write(rpcauth3+"\n")
         with open(os.path.join(get_datadir_path(self.options.tmpdir, 1), "bitcoin.conf"), 'a', encoding='utf8') as f:
             f.write(rpcuser + "\n")
             f.write(rpcpassword + "\n")
@@ -51,6 +68,7 @@
         password2 = "8/F3uMDw4KSEbw96U3CA1C4X05dkHDN2BPFjTgZW4KI="
         authpairnew = "rt:" + password
 
+        self.log.info('Correct...')
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = http.client.HTTPConnection(url.hostname, url.port)
@@ -61,6 +79,7 @@
         conn.close()
 
         # Use new authpair to confirm both work
+        self.log.info('Correct...')
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = http.client.HTTPConnection(url.hostname, url.port)
@@ -71,6 +90,7 @@
         conn.close()
 
         # Wrong login name with rt's password
+        self.log.info('Wrong...')
         authpairnew = "rtwrong:" + password
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -82,6 +102,7 @@
         conn.close()
 
         # Wrong password for rt
+        self.log.info('Wrong...')
         authpairnew = "rt:" + password + "wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -93,6 +114,7 @@
         conn.close()
 
         # Correct for rt2
+        self.log.info('Correct...')
         authpairnew = "rt2:" + password2
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -104,6 +126,7 @@
         conn.close()
 
         # Wrong password for rt2
+        self.log.info('Wrong...')
         authpairnew = "rt2:" + password2 + "wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -114,12 +137,37 @@
         assert_equal(resp.status, 401)
         conn.close()
 
+        # Correct for randomly generated user
+        self.log.info('Correct...')
+        authpairnew = self.user + ":" + self.password
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
+
+        conn = http.client.HTTPConnection(url.hostname, url.port)
+        conn.connect()
+        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
+        resp = conn.getresponse()
+        assert_equal(resp.status, 200)
+        conn.close()
+
+        # Wrong password for randomly generated user
+        self.log.info('Wrong...')
+        authpairnew = self.user + ":" + self.password + "Wrong"
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
+
+        conn = http.client.HTTPConnection(url.hostname, url.port)
+        conn.connect()
+        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
+        resp = conn.getresponse()
+        assert_equal(resp.status, 401)
+        conn.close()
+
         ###############################################################
         # Check correctness of the rpcuser/rpcpassword config options #
         ###############################################################
         url = urllib.parse.urlparse(self.nodes[1].url)
 
         # rpcuser and rpcpassword authpair
+        self.log.info('Correct...')
         rpcuserauthpair = "rpcuser💻:rpcpassword🔑"
 
         headers = {"Authorization": "Basic " + str_to_b64str(rpcuserauthpair)}
@@ -143,6 +191,7 @@
         conn.close()
 
         # Wrong password for rpcuser
+        self.log.info('Wrong...')
         rpcuserauthpair = "rpcuser:rpcpasswordwrong"
         headers = {"Authorization": "Basic " + str_to_b64str(rpcuserauthpair)}
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/authproxy.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/authproxy.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/authproxy.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/authproxy.py	2019-08-16 12:22:08.000000000 +0000
@@ -162,7 +162,7 @@
         req_start_time = time.time()
         try:
             http_response = self.__conn.getresponse()
-        except socket.timeout as e:
+        except socket.timeout:
             raise JSONRPCException({
                 'code': -344,
                 'message': '{!r} RPC took longer than {} seconds. Consider '
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/blockstore.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/blockstore.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/blockstore.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/blockstore.py	2019-08-16 12:22:08.000000000 +0000
@@ -96,7 +96,7 @@
         block.calc_sha256()
         try:
             self.blockDB[repr(block.sha256)] = bytes(block.serialize())
-        except TypeError as e:
+        except TypeError:
             logger.exception("Unexpected error")
         self.currentBlock = block.sha256
         self.headers_map[block.sha256] = CBlockHeader(block)
@@ -157,7 +157,7 @@
         tx.calc_sha256()
         try:
             self.txDB[repr(tx.sha256)] = bytes(tx.serialize())
-        except TypeError as e:
+        except TypeError:
             logger.exception("Unexpected error")
 
     def get_transactions(self, inv):
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/cdefs.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/cdefs.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/cdefs.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/cdefs.py	2019-08-16 12:22:08.000000000 +0000
@@ -48,7 +48,7 @@
 
 # Slurp in consensus.h contents
 _consensus_h_fh = open(os.path.join(get_srcdir(), 'src', 'consensus',
-                                    'consensus.h'), 'rt')
+                                    'consensus.h'), 'rt', encoding='utf-8')
 _consensus_h_contents = _consensus_h_fh.read()
 _consensus_h_fh.close()
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/comptool.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/comptool.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/comptool.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/comptool.py	2019-08-16 12:22:08.000000000 +0000
@@ -8,7 +8,7 @@
 as the test generator to TestManager.  get_tests() should be a python
 generator that returns TestInstance objects.  See below for definition.
 
-TestNode behaves as follows:
+TestP2PConn behaves as follows:
     Configure with a BlockStore and TxStore
     on_inv: log the message but don't request
     on_headers: log the chain tip
@@ -58,7 +58,7 @@
         return '{}:{}'.format(self.code, self.reason or '*')
 
 
-class TestNode(P2PInterface):
+class TestP2PConn(P2PInterface):
 
     def __init__(self, block_store, tx_store):
         super().__init__()
@@ -197,7 +197,7 @@
     def add_all_connections(self, nodes):
         for i in range(len(nodes)):
             # Create a p2p connection to each node
-            node = TestNode(self.block_store, self.tx_store)
+            node = TestP2PConn(self.block_store, self.tx_store)
             node.peer_connect('127.0.0.1', p2p_port(i))
             self.p2p_connections.append(node)
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/test_framework.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/test_framework.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/test_framework.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/test_framework.py	2019-08-16 12:22:08.000000000 +0000
@@ -121,7 +121,7 @@
         self.options.cachedir = os.path.abspath(self.options.cachedir)
 
         config = configparser.ConfigParser()
-        config.read_file(open(self.options.configfile))
+        config.read_file(open(self.options.configfile, encoding='utf-8'))
         self.options.bitcoind = os.getenv(
             "BITCOIND", default=config["environment"]["BUILDDIR"] + '/src/bitcoind' + config["environment"]["EXEEXT"])
         self.options.bitcoincli = os.getenv(
@@ -145,18 +145,18 @@
             self.setup_network()
             self.run_test()
             success = TestStatus.PASSED
-        except JSONRPCException as e:
+        except JSONRPCException:
             self.log.exception("JSONRPC error")
         except SkipTest as e:
             self.log.warning("Test Skipped: {}".format(e.message))
             success = TestStatus.SKIPPED
-        except AssertionError as e:
+        except AssertionError:
             self.log.exception("Assertion failed")
-        except KeyError as e:
+        except KeyError:
             self.log.exception("Key error")
-        except Exception as e:
+        except Exception:
             self.log.exception("Unexpected exception caught during testing")
-        except KeyboardInterrupt as e:
+        except KeyboardInterrupt:
             self.log.warning("Exiting after keyboard interrupt")
 
         if success == TestStatus.FAILED and self.options.pdbonfailure:
@@ -345,7 +345,8 @@
         self.log = logging.getLogger('TestFramework')
         self.log.setLevel(logging.DEBUG)
         # Create file handler to log all messages
-        fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log')
+        fh = logging.FileHandler(
+            self.options.tmpdir + '/test_framework.log', encoding='utf-8')
         fh.setLevel(logging.DEBUG)
         # Create console handler to log messages to stderr. By default this
         # logs only error messages, but can be configured with --loglevel.
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_framework/util.py bitcoinabc-0.19.12-uahf/test/functional/test_framework/util.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_framework/util.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_framework/util.py	2019-08-16 12:22:08.000000000 +0000
@@ -371,7 +371,7 @@
                     assert password is None  # Ensure that there is only one rpcpassword line
                     password = line.split("=")[1].strip("\n")
     if os.path.isfile(os.path.join(datadir, "regtest", ".cookie")):
-        with open(os.path.join(datadir, "regtest", ".cookie"), 'r') as f:
+        with open(os.path.join(datadir, "regtest", ".cookie"), 'r', encoding="ascii") as f:
             userpass = f.read()
             split_userpass = userpass.split(':')
             user = split_userpass[0]
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/test_runner.py bitcoinabc-0.19.12-uahf/test/functional/test_runner.py
--- bitcoinabc-0.19.11-uahf/test/functional/test_runner.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/test_runner.py	2019-08-16 12:22:08.000000000 +0000
@@ -139,7 +139,7 @@
     config = configparser.ConfigParser()
     configfile = os.path.join(os.path.abspath(
         os.path.dirname(__file__)), "..", "config.ini")
-    config.read_file(open(configfile))
+    config.read_file(open(configfile, encoding="utf8"))
 
     src_dir = config["environment"]["SRCDIR"]
     build_dir = config["environment"]["BUILDDIR"]
@@ -436,7 +436,7 @@
 
                 handle_message(message, running_jobs)
                 update_queue.task_done()
-            except Empty as e:
+            except Empty:
                 if not on_ci():
                     print("Running jobs: {}".format(", ".join([j[1] for j in running_jobs])), end="\r")
                     sys.stdout.flush()
@@ -647,7 +647,7 @@
         if not os.path.isfile(coverage_ref_filename):
             raise RuntimeError("No coverage reference found")
 
-        with open(coverage_ref_filename, 'r') as f:
+        with open(coverage_ref_filename, 'r', encoding="utf8") as f:
             all_cmds.update([i.strip() for i in f.readlines()])
 
         for root, dirs, files in os.walk(self.dir):
@@ -656,7 +656,7 @@
                     coverage_filenames.add(os.path.join(root, filename))
 
         for filename in coverage_filenames:
-            with open(filename, 'r') as f:
+            with open(filename, 'r', encoding="utf8") as f:
                 covered_cmds.update([i.strip() for i in f.readlines()])
 
         return all_cmds - covered_cmds
@@ -710,7 +710,7 @@
 
     def load_timings(self):
         if os.path.isfile(self.timing_file):
-            with open(self.timing_file) as f:
+            with open(self.timing_file, encoding="utf8") as f:
                 return json.load(f)
         else:
             return []
@@ -742,7 +742,7 @@
                                passed_results))
         merged_timings = self.get_merged_timings(new_timings)
 
-        with open(self.timing_file, 'w') as f:
+        with open(self.timing_file, 'w', encoding="utf8") as f:
             json.dump(merged_timings, f, indent=True)
 
 
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/timing.json bitcoinabc-0.19.12-uahf/test/functional/timing.json
--- bitcoinabc-0.19.11-uahf/test/functional/timing.json	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/timing.json	2019-08-16 12:22:08.000000000 +0000
@@ -361,7 +361,7 @@
  },
  {
   "name": "wallet_hd.py",
-  "time": 104
+  "time": 3
  },
  {
   "name": "wallet_import_rescan.py",
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/wallet_abandonconflict.py bitcoinabc-0.19.12-uahf/test/functional/wallet_abandonconflict.py
--- bitcoinabc-0.19.11-uahf/test/functional/wallet_abandonconflict.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/wallet_abandonconflict.py	2019-08-16 12:22:08.000000000 +0000
@@ -12,7 +12,6 @@
 """
 from decimal import Decimal
 
-from test_framework.messages import CTransaction, FromHex
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
@@ -34,8 +33,6 @@
         def total_fees(*txids):
             total = 0
             for txid in txids:
-                ctx = FromHex(CTransaction(),
-                              self.nodes[0].getrawtransaction(txid))
                 total += self.nodes[0].calculate_fee_from_txid(txid)
 
             return satoshi_round(total)
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/wallet_hd.py bitcoinabc-0.19.12-uahf/test/functional/wallet_hd.py
--- bitcoinabc-0.19.11-uahf/test/functional/wallet_hd.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/wallet_hd.py	2019-08-16 12:22:08.000000000 +0000
@@ -18,8 +18,6 @@
         self.extra_args = [[], ['-keypool=0']]
 
     def run_test(self):
-        tmpdir = self.options.tmpdir
-
         # Make sure can't switch off usehd after wallet creation
         self.stop_node(1)
         self.nodes[1].assert_start_raises_init_error(
@@ -50,8 +48,8 @@
         # Also send funds to each add
         self.nodes[0].generate(101)
         hd_add = None
-        num_hd_adds = 300
-        for i in range(num_hd_adds):
+        NUM_HD_ADDS = 10
+        for i in range(NUM_HD_ADDS):
             hd_add = self.nodes[1].getnewaddress()
             hd_info = self.nodes[1].getaddressinfo(hd_add)
             assert_equal(hd_info["hdkeypath"], "m/0'/0'/" + str(i) + "'")
@@ -68,7 +66,7 @@
         assert_equal(change_addrV["hdkeypath"], "m/0'/1'/1'")
 
         self.sync_all()
-        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+        assert_equal(self.nodes[1].getbalance(), NUM_HD_ADDS + 1)
 
         self.log.info("Restore backup ...")
         self.stop_node(1)
@@ -83,10 +81,10 @@
 
         # Assert that derivation is deterministic
         hd_add_2 = None
-        for _ in range(num_hd_adds):
+        for i in range(NUM_HD_ADDS):
             hd_add_2 = self.nodes[1].getnewaddress()
             hd_info_2 = self.nodes[1].getaddressinfo(hd_add_2)
-            assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/" + str(_) + "'")
+            assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/" + str(i) + "'")
             assert_equal(hd_info_2["hdmasterkeyid"], masterkeyid)
         assert_equal(hd_add, hd_add_2)
         connect_nodes_bi(self.nodes[0], self.nodes[1])
@@ -95,7 +93,7 @@
         # Needs rescan
         self.stop_node(1)
         self.start_node(1, extra_args=self.extra_args[1] + ['-rescan'])
-        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+        assert_equal(self.nodes[1].getbalance(), NUM_HD_ADDS + 1)
 
         # Try a RPC based rescan
         self.stop_node(1)
@@ -107,6 +105,8 @@
         self.start_node(1, extra_args=self.extra_args[1])
         connect_nodes_bi(self.nodes[0], self.nodes[1])
         self.sync_all()
+        # Wallet automatically scans blocks older than key on startup
+        assert_equal(self.nodes[1].getbalance(), NUM_HD_ADDS + 1)
         out = self.nodes[1].rescanblockchain(0, 1)
         assert_equal(out['start_height'], 0)
         assert_equal(out['stop_height'], 1)
@@ -119,7 +119,7 @@
         out = self.nodes[1].rescanblockchain()
         assert_equal(out['start_height'], 0)
         assert_equal(out['stop_height'], self.nodes[1].getblockcount())
-        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+        assert_equal(self.nodes[1].getbalance(), NUM_HD_ADDS + 1)
 
         # send a tx and make sure its using the internal chain for the changeoutput
         txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/wallet_importmulti.py bitcoinabc-0.19.12-uahf/test/functional/wallet_importmulti.py
--- bitcoinabc-0.19.11-uahf/test/functional/wallet_importmulti.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/wallet_importmulti.py	2019-08-16 12:22:08.000000000 +0000
@@ -247,8 +247,7 @@
         multi_sig_script = self.nodes[0].createmultisig(
             2, [sig_address_1['pubkey'], sig_address_2['pubkey'], sig_address_3['pubkey']])
         self.nodes[1].generate(100)
-        transactionid = self.nodes[1].sendtoaddress(
-            multi_sig_script['address'], 10.00)
+        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']
@@ -281,8 +280,7 @@
         multi_sig_script = self.nodes[0].createmultisig(
             2, [sig_address_1['pubkey'], sig_address_2['pubkey'], sig_address_3['pubkey']])
         self.nodes[1].generate(100)
-        transactionid = self.nodes[1].sendtoaddress(
-            multi_sig_script['address'], 10.00)
+        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']
@@ -315,8 +313,7 @@
         multi_sig_script = self.nodes[0].createmultisig(
             2, [sig_address_1['pubkey'], sig_address_2['pubkey'], sig_address_3['pubkey']])
         self.nodes[1].generate(100)
-        transactionid = self.nodes[1].sendtoaddress(
-            multi_sig_script['address'], 10.00)
+        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']
@@ -351,8 +348,7 @@
         multi_sig_script = self.nodes[0].createmultisig(
             2, [sig_address_1['pubkey'], sig_address_2['pubkey'], sig_address_3['pubkey']])
         self.nodes[1].generate(100)
-        transactionid = self.nodes[1].sendtoaddress(
-            multi_sig_script['address'], 10.00)
+        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']
diff -Nru bitcoinabc-0.19.11-uahf/test/functional/wallet_multiwallet.py bitcoinabc-0.19.12-uahf/test/functional/wallet_multiwallet.py
--- bitcoinabc-0.19.11-uahf/test/functional/wallet_multiwallet.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/functional/wallet_multiwallet.py	2019-08-16 12:22:08.000000000 +0000
@@ -99,7 +99,7 @@
             ['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
         # should not initialize if the specified walletdir is not a directory
         not_a_dir = wallet_dir('notadir')
-        open(not_a_dir, 'a').close()
+        open(not_a_dir, 'a', encoding="utf8").close()
         self.nodes[0].assert_start_raises_init_error(
             ['-walletdir=' + not_a_dir], 'Error: Specified -walletdir "' + re.escape(not_a_dir) + '" is not a directory')
 
diff -Nru bitcoinabc-0.19.11-uahf/test/lint/check-doc.py bitcoinabc-0.19.12-uahf/test/lint/check-doc.py
--- bitcoinabc-0.19.11-uahf/test/lint/check-doc.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/lint/check-doc.py	2019-08-16 12:22:08.000000000 +0000
@@ -48,7 +48,7 @@
     args_used = set()
     args_docd = set()
     for file in files:
-        with open(file, 'r') as f:
+        with open(file, 'r', encoding='utf-8') as f:
             content = f.read()
             args_used |= set(re.findall(re.compile(REGEX_ARG), content))
             args_docd |= set(re.findall(re.compile(REGEX_DOC), content))
diff -Nru bitcoinabc-0.19.11-uahf/test/lint/check-rpc-mappings.py bitcoinabc-0.19.12-uahf/test/lint/check-rpc-mappings.py
--- bitcoinabc-0.19.11-uahf/test/lint/check-rpc-mappings.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/lint/check-rpc-mappings.py	2019-08-16 12:22:08.000000000 +0000
@@ -1,24 +1,19 @@
 #!/usr/bin/env python3
-# Copyright (c) 2017 The Bitcoin Core developers
+# Copyright (c) 2017-2018 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Check RPC argument consistency."""
 
 from collections import defaultdict
+import glob
 import os
 import re
 import sys
 
 # Source files (relative to root) to scan for dispatch tables
-SOURCES = [
-    "src/rpc/server.cpp",
-    "src/rpc/blockchain.cpp",
-    "src/rpc/mining.cpp",
-    "src/rpc/misc.cpp",
-    "src/rpc/net.cpp",
-    "src/rpc/rawtransaction.cpp",
-    "src/wallet/rpcdump.cpp",
-    "src/wallet/rpcwallet.cpp",
+SOURCE_PATTERNS = [
+    "src/rpc/*.cpp",
+    "src/wallet/rpc*.cpp",
 ]
 # Source file (relative to root) containing conversion mapping
 SOURCE_CLIENT = 'src/rpc/client.cpp'
@@ -50,7 +45,7 @@
     """Find and parse dispatch table in implementation file `fname`."""
     cmds = []
     in_rpcs = False
-    with open(fname, "r") as f:
+    with open(fname, "r", encoding="utf8") as f:
         for line in f:
             line = line.rstrip()
             if not in_rpcs:
@@ -71,7 +66,7 @@
                     else:
                         args = []
                     cmds.append(RPCCommand(name, args))
-    assert not in_rpcs and cmds, "Something went wrong with parsing the C++ file: update the regexps"
+    assert not in_rpcs, "Something went wrong with parsing the C++ file: update the regexps"
     return cmds
 
 
@@ -79,7 +74,7 @@
     """Find and parse conversion table in implementation file `fname`."""
     cmds = []
     in_rpcs = False
-    with open(fname, "r") as f:
+    with open(fname, "r", encoding="utf8") as f:
         for line in f:
             line = line.rstrip()
             if not in_rpcs:
@@ -101,12 +96,21 @@
 
 
 def main():
+    if len(sys.argv) != 2:
+        print('Usage: {} ROOT-DIR'.format(sys.argv[0]), file=sys.stderr)
+        sys.exit(1)
+
     root = sys.argv[1]
 
+    # Find the sources files
+    sources = []
+    for glob_regex in SOURCE_PATTERNS:
+        sources.extend(glob.glob(os.path.join(root, glob_regex)))
+
     # Get all commands from dispatch tables
     cmds = []
-    for fname in SOURCES:
-        cmds += process_commands(os.path.join(root, fname))
+    for fname in set(sources):
+        cmds += process_commands(fname)
 
     cmds_by_name = {}
     for cmd in cmds:
@@ -165,7 +169,7 @@
             print('WARNING: conversion mismatch for argument named {} ({})'.format(
                 argname, list(zip(all_methods_by_argname[argname], converts_by_argname[argname]))))
 
-    sys.exit(errors > 0)
+    sys.exit(0)
 
 
 if __name__ == '__main__':
diff -Nru bitcoinabc-0.19.11-uahf/test/lint/lint-format-strings.py bitcoinabc-0.19.12-uahf/test/lint/lint-format-strings.py
--- bitcoinabc-0.19.11-uahf/test/lint/lint-format-strings.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/lint/lint-format-strings.py	2019-08-16 12:22:08.000000000 +0000
@@ -16,7 +16,7 @@
 FALSE_POSITIVES = [
     ("src/dbwrapper.cpp", "vsnprintf(p, limit - p, format, backup_ap)"),
     ("src/index/base.cpp", "FatalError(const char *fmt, const Args &... args)"),
-    ("src/netbase.cpp", "LogConnectFailure(bool manual_connection, const char* fmt, const Args&... args)"),
+    ("src/netbase.cpp", "LogConnectFailure(bool manual_connection, const char *fmt, const Args &... args)"),
     ("src/util.cpp", "strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION))"),
     ("src/util.cpp", "strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION)"),
     ("src/seeder/main.cpp", "fprintf(stderr, help, argv[0])"),
diff -Nru bitcoinabc-0.19.11-uahf/test/lint/lint-python-format.py bitcoinabc-0.19.12-uahf/test/lint/lint-python-format.py
--- bitcoinabc-0.19.11-uahf/test/lint/lint-python-format.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/lint/lint-python-format.py	2019-08-16 12:22:08.000000000 +0000
@@ -163,7 +163,7 @@
 def find_snippets(file):
     """Find code snippets in the source file that contains the percent ('%')
     character"""
-    with open(file, 'r') as f:
+    with open(file, 'r', encoding='utf-8') as f:
         snippet_line = ""
         snippets = {}
 
diff -Nru bitcoinabc-0.19.11-uahf/test/util/bitcoin-util-test.py bitcoinabc-0.19.12-uahf/test/util/bitcoin-util-test.py
--- bitcoinabc-0.19.11-uahf/test/util/bitcoin-util-test.py	2019-08-01 08:42:43.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/util/bitcoin-util-test.py	2019-08-16 12:22:08.000000000 +0000
@@ -23,7 +23,8 @@
 
 def main():
     config = configparser.ConfigParser()
-    config.read_file(open(os.path.dirname(__file__) + "/../config.ini"))
+    config.read_file(open(os.path.join(os.path.dirname(
+        __file__), "../config.ini"), encoding="utf8"))
 
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('-v', '--verbose', action='store_true')
@@ -45,7 +46,7 @@
 def bctester(testDir, input_basename, buildenv):
     """ Loads and parses the input file, runs all tests and reports results"""
     input_filename = os.path.join(testDir, input_basename)
-    raw_data = open(input_filename).read()
+    raw_data = open(input_filename, encoding="utf8").read()
     input_data = json.loads(raw_data)
 
     failed_testcases = []
@@ -84,7 +85,7 @@
     inputData = None
     if "input" in testObj:
         filename = os.path.join(testDir, testObj["input"])
-        inputData = open(filename).read()
+        inputData = open(filename, encoding="utf8").read()
         stdinCfg = subprocess.PIPE
 
     # Read the expected output data (if there is any)
@@ -96,7 +97,8 @@
         # output type from file extension (determines how to compare)
         outputType = os.path.splitext(outputFn)[1][1:]
         try:
-            outputData = open(os.path.join(testDir, outputFn)).read()
+            outputData = open(os.path.join(testDir, outputFn),
+                              encoding="utf8").read()
         except:
             logging.error("Output file " + outputFn + " can not be opened")
             raise
diff -Nru bitcoinabc-0.19.11-uahf/test/util/rpcauth-test.py bitcoinabc-0.19.12-uahf/test/util/rpcauth-test.py
--- bitcoinabc-0.19.11-uahf/test/util/rpcauth-test.py	1970-01-01 00:00:00.000000000 +0000
+++ bitcoinabc-0.19.12-uahf/test/util/rpcauth-test.py	2019-08-16 12:22:08.000000000 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2018 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 share/rpcauth/rpcauth.py
+"""
+import base64
+import configparser
+import hmac
+import importlib
+import os
+import sys
+import unittest
+
+
+class TestRPCAuth(unittest.TestCase):
+    def setUp(self):
+        config = configparser.ConfigParser()
+        config_path = os.path.abspath(
+            os.path.join(os.sep, os.path.abspath(os.path.dirname(__file__)),
+                         "../config.ini"))
+        with open(config_path, encoding="utf8") as config_file:
+            config.read_file(config_file)
+        sys.path.insert(0, os.path.dirname(config['environment']['RPCAUTH']))
+        self.rpcauth = importlib.import_module('rpcauth')
+
+    def test_generate_salt(self):
+        for i in range(16, 32 + 1):
+            self.assertEqual(len(self.rpcauth.generate_salt(i)), i * 2)
+
+    def test_generate_password(self):
+        password = self.rpcauth.generate_password()
+        expected_password = base64.urlsafe_b64encode(
+            base64.urlsafe_b64decode(password)).decode('utf-8')
+        self.assertEqual(expected_password, password)
+
+    def test_check_password_hmac(self):
+        salt = self.rpcauth.generate_salt(16)
+        password = self.rpcauth.generate_password()
+        password_hmac = self.rpcauth.password_to_hmac(salt, password)
+
+        m = hmac.new(bytearray(salt, 'utf-8'),
+                     bytearray(password, 'utf-8'), 'SHA256')
+        expected_password_hmac = m.hexdigest()
+
+        self.assertEqual(expected_password_hmac, password_hmac)
+
+
+if __name__ == '__main__':
+    unittest.main()