From 3fc3ac340fb48f480570d7fbdf6b7955420196ba Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 20 Dec 2018 13:33:36 -0500
Subject: [PATCH] disallow pak enforcement arg when nonstandard tx are possible

---
 src/init.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index 8e883435b5..be247eae4a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1764,6 +1764,11 @@ bool AppInitMain()
 
     // ********************************************************* Step 13: Load PAK List
 
+    // First, make sure -enforce_pak and -acceptnonstdtxn aren't conflicting
+    if (Params().GetEnforcePak() && gArgs.GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard())) {
+        return InitError("-enforce_pak can not be true if the network accepts non-standard transactions for relay.");
+    }
+
     //Entire list of PAK entries from conf must be of valid format
     std::vector<std::string> pak_list_str = gArgs.GetArgs("-pak");
     bool valid_paklist = true;