diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-04-24 17:55:58 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-21 16:45:16 -0400 |
commit | fa89badf887dcc01e5bdece248b5e7d234fee227 (patch) | |
tree | 67297d1686f89e7f202979cdda735132f9a65bdf /src | |
parent | fa9b4191609c3ef75e69d391eb91e4d5c1e0bcf5 (diff) | |
download | bitcoin-fa89badf887dcc01e5bdece248b5e7d234fee227.tar.xz |
test: Require standard txs in regtest
Diffstat (limited to 'src')
-rw-r--r-- | src/chainparams.cpp | 5 | ||||
-rw-r--r-- | src/chainparams.h | 3 | ||||
-rw-r--r-- | src/init.cpp | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5c0d75fca6..f937e2754b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -141,6 +141,7 @@ public: fDefaultConsistencyChecks = false; fRequireStandard = true; + m_is_test_chain = false; checkpointData = { { @@ -246,6 +247,7 @@ public: fDefaultConsistencyChecks = false; fRequireStandard = false; + m_is_test_chain = true; checkpointData = { @@ -322,7 +324,8 @@ public: vSeeds.clear(); //!< Regtest mode doesn't have any DNS seeds. fDefaultConsistencyChecks = true; - fRequireStandard = false; + fRequireStandard = true; + m_is_test_chain = true; checkpointData = { { diff --git a/src/chainparams.h b/src/chainparams.h index efca8d184b..b3fcd77cea 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -66,6 +66,8 @@ public: bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; } /** Policy: Filter transactions that do not match well-defined patterns */ bool RequireStandard() const { return fRequireStandard; } + /** If this is a test chain */ + bool IsTestChain() const { return m_is_test_chain; } uint64_t PruneAfterHeight() const { return nPruneAfterHeight; } /** Minimum free space (in GB) needed for data directory */ uint64_t AssumedBlockchainSize() const { return m_assumed_blockchain_size; } @@ -101,6 +103,7 @@ protected: std::vector<SeedSpec6> vFixedSeeds; bool fDefaultConsistencyChecks; bool fRequireStandard; + bool m_is_test_chain; CCheckpointData checkpointData; ChainTxData chainTxData; bool m_fallback_fee_enabled; diff --git a/src/init.cpp b/src/init.cpp index 2a10f28a84..be11a019b4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1150,8 +1150,9 @@ bool AppInitParameterInteraction() } fRequireStandard = !gArgs.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()); - if (chainparams.RequireStandard() && !fRequireStandard) + if (!chainparams.IsTestChain() && !fRequireStandard) { return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); + } nBytesPerSigOp = gArgs.GetArg("-bytespersigop", nBytesPerSigOp); if (!g_wallet_init_interface.ParameterInteraction()) return false; |