From 7227a8180a70cb6e01c2c14e399283adaf6a5f58 Mon Sep 17 00:00:00 2001
From: Jon Layton <me@jonl.io>
Date: Tue, 23 Oct 2018 11:44:22 -0500
Subject: [PATCH] [rpc] Fixup for network difficulty merge

---
 src/rpc/blockchain.cpp | 5 +++--
 src/rpc/blockchain.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 4d68642ee..e74af89a2 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -19,6 +19,7 @@
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <policy/rbf.h>
+#include <pow.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
 #include <script/descriptor.h>
@@ -71,7 +72,7 @@ double GetDifficultyINTERNAL(const CBlockIndex* blockindex, bool networkDifficul
 
     uint32_t bits;
     if (networkDifficulty) {
-        bits = GetNextWorkRequired(blockindex, nullptr, Params().GetConsensus());
+        bits = GetNextWorkRequired(blockindex, nullptr, Params());
     } else {
         bits = blockindex->nBits;
     }
@@ -104,7 +105,7 @@ double GetDifficultyINTERNAL(const CBlockIndex* blockindex, bool networkDifficul
 
 double GetDifficulty(const CBlockIndex* blockindex)
 {
-    return GetDifficulty(chainActive, blockindex);
+    return GetDifficultyINTERNAL(blockindex, false);
 }
 
 double GetNetworkDifficulty(const CBlockIndex* blockindex)
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 1209a3431..b29da8130 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -21,7 +21,7 @@ static constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5;
  * @return A floating point number that is a multiple of the main net minimum
  * difficulty (4295032833 hashes).
  */
-double GetDifficulty(const CBlockIndex* blockindex);
+double GetDifficulty(const CBlockIndex* blockindex = nullptr);
 
 double GetNetworkDifficulty(const CBlockIndex* blockindex = nullptr);