diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 16:20:16 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:27:19 +0200 |
| commit | fa2f6c1a611dffe5a3f63fe1b453f1dd420371b1 (patch) | |
| tree | 9a16acd69b4d0402fa648b41b7ebb63b2e593826 /src/mempool_args.cpp | |
| parent | fadc14e4f514e7167723285e0ac3d4a7149bbee6 (diff) | |
| download | bitcoin-fa2f6c1a611dffe5a3f63fe1b453f1dd420371b1.tar.xz | |
Remove ::fIsBareMultisigStd global
Diffstat (limited to 'src/mempool_args.cpp')
| -rw-r--r-- | src/mempool_args.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mempool_args.cpp b/src/mempool_args.cpp index 745d7b0316..463ad77869 100644 --- a/src/mempool_args.cpp +++ b/src/mempool_args.cpp @@ -11,6 +11,7 @@ #include <consensus/amount.h> #include <logging.h> #include <policy/feerate.h> +#include <policy/policy.h> #include <tinyformat.h> #include <util/error.h> #include <util/moneystr.h> @@ -77,6 +78,8 @@ std::optional<bilingual_str> ApplyArgsManOptions(const ArgsManager& argsman, con } } + mempool_opts.permit_bare_multisig = argsman.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG); + 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()); |