From 66664384a6fec39ecb4d8d06db66a4f193a06e33 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Thu, 21 Jul 2022 18:09:02 +0200 Subject: Remove ::g_max_datacarrier_bytes global --- src/mempool_args.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/mempool_args.cpp') diff --git a/src/mempool_args.cpp b/src/mempool_args.cpp index 463ad77869..f26f3729fd 100644 --- a/src/mempool_args.cpp +++ b/src/mempool_args.cpp @@ -80,6 +80,12 @@ std::optional ApplyArgsManOptions(const ArgsManager& argsman, con mempool_opts.permit_bare_multisig = argsman.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG); + if (argsman.GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER)) { + mempool_opts.max_datacarrier_bytes = argsman.GetIntArg("-datacarriersize", MAX_OP_RETURN_RELAY); + } else { + mempool_opts.max_datacarrier_bytes = std::nullopt; + } + mempool_opts.require_standard = !argsman.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()); if (!chainparams.IsTestChain() && !mempool_opts.require_standard) { return strprintf(Untranslated("acceptnonstdtxn is not currently supported for %s chain"), chainparams.NetworkIDString()); -- cgit v1.2.3