Merge cc2ecbb978 into merged_master (Elements PR #1378)

This commit is contained in:
Byron Hambly 2025-01-06 11:39:25 +02:00
commit ffa0c01a17
2 changed files with 2 additions and 2 deletions

View file

@ -1165,7 +1165,7 @@ public:
multi_data_permitted = true;
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", true) || create_discount_ct;
parentGenesisBlockHash = uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
const bool parent_genesis_is_null = parentGenesisBlockHash == uint256();