mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge cc7aee39b9 into merged_master (Elements PR #1492)
This commit is contained in:
commit
43e88ba24e
10 changed files with 91 additions and 11 deletions
|
|
@ -241,6 +241,7 @@ public:
|
|||
consensus.subsidy_asset = CAsset();
|
||||
anyonecanspend_aremine = false;
|
||||
enforce_pak = false;
|
||||
accept_unlimited_issuances = false;
|
||||
multi_data_permitted = false;
|
||||
accept_discount_ct = false;
|
||||
create_discount_ct = false;
|
||||
|
|
@ -385,6 +386,7 @@ public:
|
|||
consensus.subsidy_asset = CAsset();
|
||||
anyonecanspend_aremine = false;
|
||||
enforce_pak = false;
|
||||
accept_unlimited_issuances = false;
|
||||
multi_data_permitted = false;
|
||||
accept_discount_ct = false;
|
||||
create_discount_ct = false;
|
||||
|
|
@ -547,6 +549,7 @@ public:
|
|||
consensus.subsidy_asset = CAsset();
|
||||
anyonecanspend_aremine = false;
|
||||
enforce_pak = false;
|
||||
accept_unlimited_issuances = false;
|
||||
multi_data_permitted = false;
|
||||
accept_discount_ct = false;
|
||||
create_discount_ct = false;
|
||||
|
|
@ -658,6 +661,7 @@ public:
|
|||
consensus.subsidy_asset = CAsset();
|
||||
anyonecanspend_aremine = false;
|
||||
enforce_pak = false;
|
||||
accept_unlimited_issuances = false;
|
||||
multi_data_permitted = false;
|
||||
accept_discount_ct = false;
|
||||
create_discount_ct = false;
|
||||
|
|
@ -949,6 +953,8 @@ protected:
|
|||
|
||||
enforce_pak = args.GetBoolArg("-enforce_pak", false);
|
||||
|
||||
accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", false);
|
||||
|
||||
// Allow multiple op_return outputs by relay policy
|
||||
multi_data_permitted = args.GetBoolArg("-multi_data_permitted", enforce_pak);
|
||||
|
||||
|
|
@ -1204,6 +1210,8 @@ public:
|
|||
|
||||
enforce_pak = true;
|
||||
|
||||
accept_unlimited_issuances = false;
|
||||
|
||||
multi_data_permitted = true;
|
||||
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
|
||||
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", true) || create_discount_ct;
|
||||
|
|
@ -1557,6 +1565,8 @@ public:
|
|||
|
||||
enforce_pak = args.GetBoolArg("-enforce_pak", enforce_pak);
|
||||
|
||||
accept_unlimited_issuances = false;
|
||||
|
||||
multi_data_permitted = args.GetBoolArg("-multi_data_permitted", multi_data_permitted);
|
||||
create_discount_ct = args.GetBoolArg("-creatediscountct", create_discount_ct);
|
||||
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct) || create_discount_ct;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue