diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f3385ef2da..ade7c3564d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -561,7 +561,7 @@ class CCustomParams : public CRegTestParams { enforce_pak = args.GetBoolArg("-enforce_pak", false); // Allow multiple op_return outputs by relay policy - multi_data_permitted = args.GetBoolArg("-multi_data_permitted", true); + multi_data_permitted = args.GetBoolArg("-multi_data_permitted", enforce_pak); // bitcoin regtest is the parent chain by default parentGenesisBlockHash = uint256S(args.GetArg("-parentgenesisblockhash", "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")); diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 4f12c2328b..21497ac30c 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -44,8 +44,8 @@ void SetupChainParamsBaseOptions() gArgs.AddArg("-fedpegscript", "The script for the federated peg.", false, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-enforce_pak", "Causes standardness checks to enforce Pegout Authorization Key(PAK) validation, and miner to include PAK commitments when configured. Can not be set when acceptnonstdtx is set to true.", false, OptionsCategory::ELEMENTS); - gArgs.AddArg("-multi_data_permitted", "Allow relay of multiple OP_RETURN outputs. (default: true)", false, OptionsCategory::ELEMENTS); gArgs.AddArg("-pak", "Entries in the PAK list. Order of entries matter.", false, OptionsCategory::ELEMENTS); + gArgs.AddArg("-multi_data_permitted", "Allow relay of multiple OP_RETURN outputs. (default: -enforce_pak)", false, OptionsCategory::ELEMENTS); gArgs.AddArg("-con_csv_deploy_start", "Starting height for CSV deployment. (default: -1, which means ACTIVE from genesis)", false, OptionsCategory::ELEMENTS); // END ELEMENTS // diff --git a/test/functional/mempool_accept.py b/test/functional/mempool_accept.py index 7769b68407..98f4493fe0 100755 --- a/test/functional/mempool_accept.py +++ b/test/functional/mempool_accept.py @@ -42,6 +42,7 @@ class MempoolAcceptanceTest(BitcoinTestFramework): '-txindex', '-reindex', # Need reindex for txindex '-acceptnonstdtxn=0', # Try to mimic main-net + '-multi_data_permitted=1', # Elements test ]] * self.num_nodes def skip_test_if_missing_module(self):