diff options
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/chainparams.cpp | 4 | ||||
-rw-r--r-- | src/kernel/chainparams.h | 3 | ||||
-rw-r--r-- | src/kernel/mempool_options.h | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index d9ed1547b3..733a3339b3 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -151,7 +151,6 @@ public: vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_main), std::end(chainparams_seed_main)); fDefaultConsistencyChecks = false; - fRequireStandard = true; m_is_test_chain = false; m_is_mockable_chain = false; @@ -259,7 +258,6 @@ public: vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_test), std::end(chainparams_seed_test)); fDefaultConsistencyChecks = false; - fRequireStandard = false; m_is_test_chain = true; m_is_mockable_chain = false; @@ -382,7 +380,6 @@ public: bech32_hrp = "tb"; fDefaultConsistencyChecks = false; - fRequireStandard = true; m_is_test_chain = true; m_is_mockable_chain = false; } @@ -474,7 +471,6 @@ public: vSeeds.emplace_back("dummySeed.invalid."); fDefaultConsistencyChecks = true; - fRequireStandard = true; m_is_test_chain = true; m_is_mockable_chain = true; diff --git a/src/kernel/chainparams.h b/src/kernel/chainparams.h index ad0b49a885..2d38af609c 100644 --- a/src/kernel/chainparams.h +++ b/src/kernel/chainparams.h @@ -102,8 +102,6 @@ public: const CBlock& GenesisBlock() const { return genesis; } /** Default value for -checkmempool and -checkblockindex argument */ bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; } - /** Policy: Filter transactions that do not match well-defined patterns */ - bool RequireStandard() const { return fRequireStandard; } /** If this chain is exclusively used for testing */ bool IsTestChain() const { return m_is_test_chain; } /** If this chain allows time to be mocked */ @@ -179,7 +177,6 @@ protected: CBlock genesis; std::vector<uint8_t> vFixedSeeds; bool fDefaultConsistencyChecks; - bool fRequireStandard; bool m_is_test_chain; bool m_is_mockable_chain; CCheckpointData checkpointData; diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h index 58bb3debbf..757be41b3c 100644 --- a/src/kernel/mempool_options.h +++ b/src/kernel/mempool_options.h @@ -23,6 +23,8 @@ static constexpr unsigned int DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB{5}; static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336}; /** Default for -mempoolfullrbf, if the transaction replaceability signaling is ignored */ static constexpr bool DEFAULT_MEMPOOL_FULL_RBF{false}; +/** Default for -acceptnonstdtxn */ +static constexpr bool DEFAULT_ACCEPT_NON_STD_TXN{false}; namespace kernel { /** |