diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-20 15:59:03 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:23:24 +0200 |
| commit | fa148602e67fe035b1b21eff6c0b656919ac2d45 (patch) | |
| tree | 603358f5030d2335df4b0df648fbcae2aa5353c2 /src/mempool_args.cpp | |
| parent | fa468bdfb62dec286cb977db78d3e47b64dafeba (diff) | |
Remove ::fRequireStandard global
Diffstat (limited to 'src/mempool_args.cpp')
| -rw-r--r-- | src/mempool_args.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mempool_args.cpp b/src/mempool_args.cpp index da0fb62262..942c875847 100644 --- a/src/mempool_args.cpp +++ b/src/mempool_args.cpp @@ -39,6 +39,11 @@ std::optional<bilingual_str> ApplyArgsManOptions(const ArgsManager& argsman, con if (auto hours = argsman.GetIntArg("-mempoolexpiry")) mempool_opts.expiry = std::chrono::hours{*hours}; + 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()); + } + mempool_opts.full_rbf = argsman.GetBoolArg("-mempoolfullrbf", mempool_opts.full_rbf); ApplyArgsManOptions(argsman, mempool_opts.limits); |