mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge branch 'master' into elem-23.4.0rc3
This commit is contained in:
commit
804de4ea86
14 changed files with 361 additions and 170 deletions
|
|
@ -1108,6 +1108,7 @@ public:
|
|||
default_signblockscript = "51210217e403ddb181872c32a0cd468c710040b2f53d8cac69f18dad07985ee37e9a7151ae";
|
||||
create_discount_ct = false;
|
||||
accept_discount_ct = true;
|
||||
accept_unlimited_issuances = true;
|
||||
UpdateFromArgs(args);
|
||||
multi_data_permitted = true;
|
||||
SetGenesisBlock();
|
||||
|
|
@ -1220,7 +1221,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