diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 18:09:02 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:29:16 +0200 |
| commit | 66664384a6fec39ecb4d8d06db66a4f193a06e33 (patch) | |
| tree | 7769cc7b287f4202edebae9c5314e8be4509d7e7 /src/mempool_args.cpp | |
| parent | fad0b4fab849eb5f1f0aa54ebc290f85a473ec91 (diff) | |
| download | bitcoin-66664384a6fec39ecb4d8d06db66a4f193a06e33.tar.xz | |
Remove ::g_max_datacarrier_bytes global
Diffstat (limited to 'src/mempool_args.cpp')
| -rw-r--r-- | src/mempool_args.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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<bilingual_str> 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()); |