Merge branch 'master' into elem-23.4.0rc3

This commit is contained in:
Pablo Greco 2026-06-29 08:03:20 -07:00
commit 804de4ea86
No known key found for this signature in database
GPG key ID: 2F656B0610604482
14 changed files with 361 additions and 170 deletions

View file

@ -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);