miner adds commitment when pak enforcement is set only

instagibbs · instagibbs · commit 0eee1a1dcacb · 2018-12-20T13:33:52.000-05:00
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -112,8 +112,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     // ELEMENTS: PAK
     // Create block pak commitment if set in conf file and validating pegouts
-    if (!gArgs.GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard())
-            && g_paklist_config) {
+    if (Params().GetEnforcePak() && g_paklist_config) {
         if (*g_paklist_config != g_paklist_blockchain) {
             g_paklist_config->CreateCommitments(commitments);
         }

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc`
`112`	`112`
`113`	`113`	`// ELEMENTS: PAK`
`114`	`114`	`// Create block pak commitment if set in conf file and validating pegouts`
`115`		`- if (!gArgs.GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard())`
`116`		`- && g_paklist_config) {`
	`115`	`+ if (Params().GetEnforcePak() && g_paklist_config) {`
`117`	`116`	`if (*g_paklist_config != g_paklist_blockchain) {`
`118`	`117`	`g_paklist_config->CreateCommitments(commitments);`
`119`	`118`	`}`