mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge remote-tracking branch 'origin/master' into HEAD
This commit is contained in:
commit
7c1fcd1ba6
14 changed files with 327 additions and 179 deletions
|
|
@ -1293,6 +1293,7 @@ public:
|
|||
default_signblockscript = "51210217e403ddb181872c32a0cd468c710040b2f53d8cac69f18dad07985ee37e9a7151ae";
|
||||
create_discount_ct = false;
|
||||
accept_discount_ct = true;
|
||||
accept_unlimited_issuances = true;
|
||||
UpdateFromArgs(args);
|
||||
multi_data_permitted = true;
|
||||
SetGenesisBlock();
|
||||
|
|
@ -1402,7 +1403,7 @@ public:
|
|||
|
||||
enforce_pak = true;
|
||||
|
||||
accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", false);
|
||||
accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", true);
|
||||
|
||||
multi_data_permitted = true;
|
||||
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue