Skip to content

Commit 66280e9

Browse files
committed
disallow pak enforcement arg when nonstandard tx are possible
1 parent 657058b commit 66280e9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/init.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,6 +1753,11 @@ bool AppInitMain()
17531753

17541754
// ********************************************************* Step 13: Load PAK List
17551755

1756+
// First, make sure -enforce_pak and -acceptnonstdtxn aren't conflicting
1757+
if (Params().GetEnforcePak() && gArgs.GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard())) {
1758+
return InitError("-enforce_pak can not be true if the network accepts non-standard transactions for relay.");
1759+
}
1760+
17561761
//Entire list of PAK entries from conf must be of valid format
17571762
std::vector<std::string> pak_list_str = gArgs.GetArgs("-pak");
17581763
bool valid_paklist = true;

0 commit comments

Comments
 (0)